agents-relay 2.0.95 → 2.0.97

package/dist/adapters.js

@@ -228,63 +228,12 @@ export async function ensureChatGptBrowserWorkspace(command = process.env.AGENTS
     }
     await admin.ensureWorkspace(CHATGPT_BROWSER_WORKSPACE, CHATGPT_BROWSER_WORKSPACE_POOL_SIZE);
 }
-/**
- * The upstream new-turn action accepts idempotency_key but does not enforce it.
- * Inspect the current thread before resubmitting after an ambiguous exit.
- * If the transcript is not observable, fail closed rather than duplicate.
- */
-async function findExistingReviewTurn(cli, sessionId, delivery, signal) {
-    const pathname = delivery.projectId
-        ? `/g/${encodeURIComponent(delivery.projectId)}/c/${encodeURIComponent(delivery.threadId)}`
-        : `/c/${encodeURIComponent(delivery.threadId)}`;
-    const marker = `Relay delivery ID: ${delivery.requestId}`;
-    const inspectJs = `(() => {
-    const legacy = [...document.querySelectorAll('[data-message-author-role="user"]')]
-      .map(e => ({text: (e.innerText || '').trim(), id: e.getAttribute('data-message-id') || ''})).filter(x => x.text);
-    if (legacy.length) return legacy;
-    return [...document.querySelectorAll('h4')].filter(e => (e.innerText || '').trim() === 'You said:')
-      .map((e,i) => ({text: (e.parentElement?.innerText || '').trim(), id: 'dom-user-' + i})).filter(x => x.text);
-  })()`;
-    const script = [
-        'import json, time',
-        'from urllib.parse import urlsplit',
-        `url = ${JSON.stringify(`https://chatgpt.com${pathname}`)}`,
-        `marker = ${JSON.stringify(marker)}`,
-        'goto_url(url)',
-        'wait_for_load()',
-        'if urlsplit(page_info().get("url", "")).path.rstrip("/") != urlsplit(url).path.rstrip("/"): raise RuntimeError("review thread redirect mismatch")',
-        'turns = []',
-        'for attempt in range(30):',
-        `    turns = js(${JSON.stringify(inspectJs)}) or []`,
-        '    if turns: break',
-        '    time.sleep(0.5)',
-        'if not turns: raise RuntimeError("review thread transcript unavailable; refusing ambiguous resubmission")',
-        'matches = [turn for turn in turns if marker in turn.get("text", "")]',
-        'if len(matches) > 1: raise RuntimeError("duplicate review delivery detected; manual reconciliation required")',
-        'print(json.dumps({"found": bool(matches), "user_message_id": matches[0].get("id") if matches else None}), flush=True)',
-    ].join('\n');
-    const envelope = parseWorkspaceJson(await browserWorkspaceCommand(cli, ['session', 'exec', sessionId], script, signal));
-    if (envelope.ok !== true || typeof envelope.stdout !== 'string')
-        throw new Error('review thread inspection returned no executable result');
-    const observation = parseWorkspaceJson(envelope.stdout);
-    if (typeof observation.found !== 'boolean')
-        throw new Error('review thread inspection returned no authoritative result');
-    if (!observation.found)
-        return null;
-    return { status: 'submitted', mode: 'new-turn', thread_id: delivery.threadId, project_id: delivery.projectId,
-        verified_by: 'existing-user-turn', user_message_id: typeof observation.user_message_id === 'string' ? observation.user_message_id : null };
-}
-async function runBrowserWorker(cli, configFile, signal, action = 'temporary-submit', delivery) {
+async function runBrowserWorker(cli, configFile, signal, action = 'temporary-submit') {
     const session = parseWorkspaceJson(await browserWorkspaceCommand(cli, ['session', 'start', '--workspace', CHATGPT_BROWSER_WORKSPACE], undefined, signal));
     const sessionId = session.session_id;
     if (typeof sessionId !== 'string' || !sessionId)
         throw new Error('browser-workspace session start returned no session_id');
     try {
-        if (delivery) {
-            const existing = await findExistingReviewTurn(cli, sessionId, delivery, signal);
-            if (existing)
-                return JSON.stringify(existing);
-        }
         return await browserWorkspaceCommand(cli, ['platform', 'run', 'chatgpt', action, '--session-id', sessionId, '--config', configFile], undefined, signal);
     }
     finally {
@@ -310,7 +259,7 @@ function browserWorkerRunner() {
                 if (signal.aborted)
                     throw new Error('browser-worker execution aborted');
                 const action = delivery ? 'new-turn' : 'temporary-submit';
-                const output = await runBrowserWorker(cli, configFile, signal, action, delivery);
+                const output = await runBrowserWorker(cli, configFile, signal, action);
                 return JSON.stringify(parseDriverJson(output));
             }
             finally {

package/dist/cli-help.js

@@ -58,7 +58,7 @@ Required: --repo OWNER/REPO --pr NUMBER --id JOB_ID.
 Optional: --thread-id THREAD_ID persists a reviewer override; omitted uses Job reviewer/creator thread or legacy route. Rejects pending reviews and wakes managed reconciliation.`,
     'job create': `Create a SQLite-authoritative Job (objective-only).
 
-Required: --repo OWNER/REPO and a standalone Job objective. Job ID defaults to an auto-incrementing repository-scoped number; --id is optional for compatibility. Existing PR adoption is an explicit separate command: job adopt.
+Required: --repo OWNER/REPO and a standalone Job objective. Job ID defaults to an auto-incrementing store-global number; --id is optional for compatibility. Existing PR adoption is an explicit separate command: job adopt.
 Common: --id JOB_ID (optional), --title TEXT, --objective-file PATH|- (preferred), --objective MARKDOWN (short/simple only), --project-path RELATIVE_PATH, --priority P0|P1|P2|P3, --mode fixed|autonomous, --initial-plan, --no-review, --tag JSON, --reviewer-thread-id ID, --creator-thread-id ID, --implementation-thread-id ID. --objective and --objective-file are mutually exclusive.
 Job creation always enables auto-merge. By default it is create-only; --initial-plan validates the first real Planner round before atomically creating the durable Job and Plan, then publishes the normal wake so Relay can continue without a second orchestrator command. Re-running create against an already healthy Job is idempotent and does not mutate its metadata.
 

package/dist/job-task-id-sequence.js

@@ -14,14 +14,17 @@ export function isGeneratedEntityId(id, repository, kind) {
         const legacyPrefix = generatedEntityPrefix(repository, kind);
         return id.startsWith(legacyPrefix) && /^[0-9]+$/.test(id.slice(legacyPrefix.length));
     }
+    if (/^[1-9][0-9]*$/.test(id))
+        return true;
     const prefix = generatedEntityPrefix(repository, kind);
     return id.startsWith(prefix) && /^[0-9]+$/.test(id.slice(prefix.length));
 }
-/** Jobs remain repository-scoped. Task IDs are one Relay-global monotonically increasing integer sequence. Allocation is serialized by SQLite. */
+/** Job and Task IDs each use their own store-global sequence. SQLite serializes allocation; legacy identifiers remain readable. */
 export function allocateEntityId(directory, repository, kind, requestKey, occupied = new Set()) {
-    const prefix = kind === 'job' ? generatedEntityPrefix(repository, kind) : '';
-    const scope = kind === 'task' ? '*' : repository;
-    const scopedRequestKey = requestKey && kind === 'task' ? `${repository}:${requestKey}` : requestKey;
+    generatedEntityPrefix(repository, kind); // validate repository even though its name no longer appears in the ID
+    const prefix = '';
+    const scope = '*';
+    const scopedRequestKey = requestKey ? `${repository}:${requestKey}` : undefined;
     if (requestKey !== undefined && (!requestKey || requestKey.length > 512))
         throw new Error('Invalid idempotency key');
     mkdirSync(directory, { recursive: true });
@@ -39,6 +42,7 @@ export function allocateEntityId(directory, repository, kind, requestKey, occupi
                 }
             }
             const old = db.prepare('SELECT value FROM sequences WHERE repository=? AND kind=?').get(scope, kind);
+            // Existing generated numeric IDs across all repositories are reserved by the caller.
             let next = (old?.value ?? 0) + 1;
             while (occupied.has(prefix + next))
                 next++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agents-relay",
-  "version": "2.0.95",
+  "version": "2.0.97",
   "description": "Durable async agent jobs coordinated through GitHub pull requests",
   "type": "module",
   "bin": {

package/skills/agents-relay/contracts/orchestrator-workflows.md

@@ -24,6 +24,14 @@ The initial decomposition belongs to that durable Planner round. The orchestrato
 
 ## P0 / self job workflow
 
+For a self Job owned by the current XChat thread, resolve the current thread ID
+before creating the Job. If it cannot be retrieved reliably, ask the user for
+the thread ID before proceeding. Set `creatorThreadId`,
+`implementationThreadId`, and `reviewerThreadId` to that same thread ID at
+creation, using the corresponding `--creator-thread-id`,
+`--implementation-thread-id`, and `--reviewer-thread-id` options. Do not infer
+the thread ID from an unrelated worker, execution, or previous conversation.
+
 P0/self work is ordinary durable Relay work. The orchestrator may choose normal
 Task requirements, but every newly created work Task is executable by a
 worker/model route selected by Execution Router. Relay has no privileged