merge: upstream v1.1.10

.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agmsg",
   "description": "Cross-agent messaging via SQLite. Send messages between CLI AI agents. No daemon, no network.",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "author": {
     "name": "fujibee"
   },

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.10] - 2026-07-19
+
+### Fixed
+- Allow launcher-reserved bridge PID (#444)
+
 ## [1.1.9] - 2026-07-19
 
 ### Added
@@ -306,6 +311,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Handle empty TaskList explicitly to stop fresh-session loop (#71)
 - Storage driver pluginization design (epic #51) (#52)
 
+[1.1.10]: https://github.com/fujibee/agmsg/compare/app-v0.3.0...v1.1.10
 [1.1.9]: https://github.com/fujibee/agmsg/compare/app-v0.2.0...v1.1.9
 [1.1.8]: https://github.com/fujibee/agmsg/compare/app-v0.1.5...v1.1.8
 [app-v0.1.5]: https://github.com/fujibee/agmsg/compare/v1.1.7...app-v0.1.5

VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

app/AGMSG_CORE_REF

@@ -1 +1 @@
-v1.1.8
+v1.1.9

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "agmsg-app",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

app/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "agmsg-app"
-version = "0.2.0"
+version = "0.3.0"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"

app/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "agmsg",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "identifier": "cc.agmsg.app",
   "build": {
     "beforeDevCommand": "pnpm dev",

cliff.toml

@@ -73,6 +73,7 @@ commit_parsers = [
   { message = "^Stop ancestor project resolution", group = "<!-- 1 -->Fixed" },
   { message = "^Fix Codex monitor multi-identity delivery", group = "<!-- 1 -->Fixed" },
   { message = "^Isolate Codex monitor bridges by role", group = "<!-- 0 -->Added" },
+  { message = "^Allow launcher-reserved bridge PID", group = "<!-- 1 -->Fixed" },
   # Everything else (merges, initial commit, misc) is intentionally dropped.
   { message = ".*", skip = true },
 ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "agmsg",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "Cross-agent messaging via SQLite for CLI AI agents (Claude Code, Codex, Gemini CLI, GitHub Copilot CLI, Antigravity, OpenCode). The npm package is a thin bootstrapper that fetches and runs the canonical bash installer at https://github.com/fujibee/agmsg.",
   "bin": {
     "agmsg": "bin/agmsg.js"

scripts/drivers/types/codex/codex-bridge.js

@@ -1302,6 +1302,10 @@ class CodexBridge {
   ensureSingleInstance() {
     const existing = readPid(this.pidfile);
     if (!existing) return;
+    // The launcher records the spawned PID immediately so status never points
+    // at a stale predecessor. When that write wins the startup race, this
+    // process sees its own PID here; it owns the reservation, not a peer bridge.
+    if (existing === process.pid) return;
     try {
       process.kill(existing, 0);
       die(`bridge already running for ${this.identity.team}/${this.identity.name} (pid ${existing})`);

tests/test_codex_bridge.bats

@@ -564,6 +564,27 @@ EOF
   [[ "$output" =~ "bridge already running" ]]
 }
 
+@test "codex-bridge: accepts its PID when the launcher records it before startup (#442)" {
+  skip_on_windows "codex bridge identity resolution on Windows (#182)"
+  mkdir -p "$TEST_SKILL_DIR/run"
+  local wrapper="$TEST_SKILL_DIR/run-with-preseeded-pid.sh"
+  cat > "$wrapper" <<'EOF'
+#!/usr/bin/env bash
+pidfile="$1"
+shift
+printf '%s\n' "$$" > "$pidfile"
+exec "$@"
+EOF
+  chmod +x "$wrapper"
+
+  AGMSG_CODEX_APP_SERVER_CMD="exit 1" run "$wrapper" \
+    "$TEST_SKILL_DIR/run/codex-bridge.team.alice.pid" \
+    node "$TYPES/codex/codex-bridge.js" --project "$PROJ" --team team --name alice
+
+  [ "$status" -ne 0 ]
+  [[ ! "$output" =~ "bridge already running" ]]
+}
+
 @test "codex-bridge: starts a turn when app-server reports watch-once pending" {
   run node -e 'const r = require("child_process").spawnSync("/bin/sh", ["-c", "true"]); if (r.error) { console.error(r.error.message); process.exit(1); }'
   if [ "$status" -ne 0 ]; then