@agfpd/iapeer 0.2.23 → 0.2.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agfpd/iapeer",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Foundation core for the iapeer multi-agent ecosystem: identity, registry, storage, codec.",
   "type": "module",
   "bin": {

package/src/launch/canary.test.ts

@@ -17,6 +17,7 @@ import {
   signalCanaryClean,
 } from './canary.ts'
 import { killSession } from '../lifecycle/index.ts'
+import { teardownAlwaysOnSession } from './launchdRun.ts'
 
 const tmuxAvailable = spawnSync('tmux', ['-V'], { stdio: 'ignore' }).status === 0
 
@@ -92,7 +93,7 @@ describe.if(tmuxAvailable)('canary live (sandbox tmux servers)', () => {
   afterAll(() => {
     for (const sock of socks) {
       // teardown is DELIBERATE → signal each canary before killing its server
-      for (const id of ['claude-canadirty', 'claude-canaclean', 'claude-canakill']) {
+      for (const id of ['claude-canadirty', 'claude-canaclean', 'claude-canakill', 'notifier-canatear']) {
         signalCanaryClean(sock, id)
       }
       spawnSync('tmux', ['-S', sock, 'kill-server'], { stdio: 'ignore' })
@@ -152,6 +153,32 @@ describe.if(tmuxAvailable)('canary live (sandbox tmux servers)', () => {
     20000,
   )
 
+  test(
+    'teardownAlwaysOnSession (signal-exit of runAlwaysOn) kills session+server, canary stays silent',
+    async () => {
+      const identity = 'notifier-canatear'
+      const { sock, logDir } = bringUp(identity)
+      expect(ensureServerCanary({ identity, sock, exitLogDir: logDir })).toBe('spawned')
+      expect(await waitFor(() => canaryRunning(identity), 3000)).toBe(true)
+      await sleep(500)
+
+      teardownAlwaysOnSession(sock, identity) // the bootout/shutdown path
+      // the whole server must be gone (the poller dies WITH the watcher — грабля closed)
+      expect(
+        await waitFor(
+          () => spawnSync('tmux', ['-S', sock, 'has-session', '-t', identity], { stdio: 'ignore' }).status !== 0,
+          3000,
+        ),
+      ).toBe(true)
+      expect(await waitFor(() => !canaryRunning(identity), 3000)).toBe(true)
+      await sleep(300)
+      expect(existsSync(exitLogPath(logDir)) && readFileSync(exitLogPath(logDir), 'utf8').includes('ev=server-exit')).toBe(
+        false,
+      )
+    },
+    20000,
+  )
+
   test(
     'killSession (lifecycle clean reap) signals the canary before kill-server → no record',
     async () => {

package/src/launch/launchdRun.ts

@@ -23,6 +23,7 @@ import { buildProcessAddress, buildSocketPath } from '../core/socket.ts'
 import { peerLogsDir, pluginLogsDir } from '../storage/index.ts'
 import { readPeerProfile } from '../identity/index.ts'
 import { getAdapter, launch } from './index.ts'
+import { signalCanaryClean } from './canary.ts'
 import type { LaunchConfig, LaunchSpec } from './types.ts'
 
 /** Block-watch poll cadence — seconds, deliberately NOT a tight loop (the session
@@ -39,6 +40,29 @@ function sessionAlive(sock: string, identity: string): boolean {
   return spawnSync('tmux', ['-S', sock, 'has-session', '-t', identity], { stdio: 'ignore' }).status === 0
 }
 
+/**
+ * Tear down the always-on session WITH its tmux server (when this session was the
+ * last one) — the signal-exit counterpart of lifecycle.killSession, local to avoid
+ * a launch ⇆ lifecycle import. Canary-signaled first: this is a DELIBERATE stop.
+ *
+ * Closes the live грабля «bootout не убивает поллера» (boris 10.06, second
+ * strike): `launchctl bootout` TERMs THIS watcher process, but the detached tmux
+ * server — and the runtime poller inside it — survived holding STALE in-memory
+ * state (e.g. a notifier trigger's old target after a same-id replace), so a
+ * plain bootout+bootstrap was NOT a real restart. With the teardown, the session
+ * dies with its watcher: bootout = full stop, bootstrap = fresh bring-up that
+ * re-reads durable state. `iapeer stop` (bootout + killSession) is unchanged —
+ * both paths now converge on the same end state.
+ */
+export function teardownAlwaysOnSession(sock: string, identity: string): void {
+  signalCanaryClean(sock, identity)
+  spawnSync('tmux', ['-S', sock, 'kill-session', '-t', identity], { stdio: 'ignore' })
+  const ls = spawnSync('tmux', ['-S', sock, 'list-sessions', '-F', '#{session_name}'], { encoding: 'utf8' })
+  if (!(ls.stdout ?? '').trim()) {
+    spawnSync('tmux', ['-S', sock, 'kill-server'], { stdio: 'ignore' })
+  }
+}
+
 /**
  * Build the always-on LaunchSpec for an infra peer, reading intelligence from the
  * local peer-profile.json. launchd sets WorkingDirectory = peer cwd, so that file
@@ -159,6 +183,12 @@ export async function runAlwaysOn(personality: string, runtime: string, cwd: str
     })
     interrupt = null
   }
+  // Signal-initiated exit (bootout / shutdown / kickstart -k) tears the session
+  // down WITH this watcher — without it the detached tmux poller outlived bootout
+  // holding stale in-memory state (см. teardownAlwaysOnSession). A natural session
+  // death (stop=false) skips this: there is nothing to tear down, exit 0 →
+  // KeepAlive respawns a fresh bring-up.
+  if (stop) teardownAlwaysOnSession(sock, identity)
   return 0
 }