graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
Pin the actual shell handle in desktop shutdown checks
Rach Pradhan626e0a0aa3ab
diff --git a/apps/native/electron/shutdown-job-id.cjs b/apps/native/electron/shutdown-job-id.cjsnew file mode 100644index 00000000..b28397b6--- /dev/null+++ b/apps/native/electron/shutdown-job-id.cjs@@ -0,0 +1,15 @@+const assert = require('node:assert/strict');+/** Read the listener's actual handle from captured model tool results. */+exports.listenerJobId = requests => {+ const ids = new Set();+ for (const request of requests) for (const message of request.messages || []) {+ if (message.role !== 'tool' || typeof message.content !== 'string') continue;+ const match = message.content.match(/^\[job (\d+) started: python3 listener\.py\](?:\n|$)/);+ if (!match) continue;+ const id = Number(match[1]);+ assert(Number.isSafeInteger(id) && id > 0, 'Listener handle must be an exact positive JSON integer');+ ids.add(String(id));+ }+ assert.equal(ids.size, 1, 'Expected exactly one listener handle in completed tool results');+ return [...ids][0];+};diff --git a/apps/native/electron/shutdown-job-id.test.cjs b/apps/native/electron/shutdown-job-id.test.cjsnew file mode 100644index 00000000..059ffb9f--- /dev/null+++ b/apps/native/electron/shutdown-job-id.test.cjs@@ -0,0 +1,14 @@+const { test } = require('node:test');+const assert = require('node:assert/strict');+const { listenerJobId } = require('./shutdown-job-id.cjs');+const result = id => ({role:'tool',content:`[job ${id} started: python3 listener.py]\npersistent server`});+test('shutdown pin targets actual JS-exact handle, deduplicating replayed tool history', () => {+ for (const id of ['1','4294967296','9007199254740991']) {+ assert.equal(listenerJobId([{messages:[result(id)]},{messages:[result(id),{role:'tool',content:'[job 7 started: python3 ready.py]'}]}]),id);+ }+});+test('shutdown pin rejects guessed, ambiguous and inexact handles', () => {+ assert.throws(()=>listenerJobId([{messages:[{role:'assistant',content:result(1).content}]}]),/exactly one/);+ assert.throws(()=>listenerJobId([{messages:[result(1),result(2)]}]),/exactly one/);+ assert.throws(()=>listenerJobId([{messages:[result('9007199254740992')]}]),/exact/);+});diff --git a/apps/native/electron/smoke-server-lifecycle.cjs b/apps/native/electron/smoke-server-lifecycle.cjsindex 80726a3d..83ff94e1 100644--- a/apps/native/electron/smoke-server-lifecycle.cjs+++ b/apps/native/electron/smoke-server-lifecycle.cjs@@ -60,8 +60,9 @@ exports.run = async ({win, backend}) => {await until(() => js(`document.body.innerText.includes('Listener ready for shutdown.')`), 'agent completion');phase('agent completion');if (process.env.GRAFF_SHUTDOWN_PIN === '1') {- await submit('/jobs keep 1');- await until(() => js(`document.body.innerText.includes('job 1 pinned')`), 'explicit user pin');+ const jobId = require('./shutdown-job-id.cjs').listenerJobId(JSON.parse(fs.readFileSync(path.join(output, 'requests.json'), 'utf8')));+ await submit(`/jobs keep ${jobId}`);+ await until(() => js(`document.body.innerText.includes(${JSON.stringify(`job ${jobId} pinned`)})`), 'explicit user pin');phase('explicit user pin');}const listener = JSON.parse(fs.readFileSync(path.join(workspace,'listener.json'),'utf8'));