@straiffi/archon 1.11.12 → 1.11.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. package/dist/client/assets/{ActivityView-D0YxLUqI.js → ActivityView-TwJeVDII.js} +1 -1
  2. package/dist/client/assets/{GitHubActionsDialog-hUHzJXrR.js → GitHubActionsDialog-Umiz7hRS.js} +1 -1
  3. package/dist/client/assets/VerificationDialog-BVaLckVH.js +4 -0
  4. package/dist/client/assets/{architectureDiagram-3BPJPVTR-CK9xwJva.js → architectureDiagram-3BPJPVTR-DG6n6a9N.js} +1 -1
  5. package/dist/client/assets/{blockDiagram-GPEHLZMM-f-jooSU5.js → blockDiagram-GPEHLZMM-fpqlAUZA.js} +1 -1
  6. package/dist/client/assets/{c4Diagram-AAUBKEIU-Dw8tFXqU.js → c4Diagram-AAUBKEIU-DD-BA8Fj.js} +1 -1
  7. package/dist/client/assets/channel-BvWs2-ry.js +1 -0
  8. package/dist/client/assets/{chunk-2J33WTMH-Dz9sx1mJ.js → chunk-2J33WTMH-BcwQlxYR.js} +1 -1
  9. package/dist/client/assets/{chunk-3OPIFGDE-DHxSlFck.js → chunk-3OPIFGDE-DCbOiRKI.js} +1 -1
  10. package/dist/client/assets/{chunk-5ZQYHXKU-BexTYm2L.js → chunk-5ZQYHXKU-BAgSocEO.js} +1 -1
  11. package/dist/client/assets/{chunk-727SXJPM-BgHp49jV.js → chunk-727SXJPM-0NBz7Bl7.js} +1 -1
  12. package/dist/client/assets/{chunk-AQP2D5EJ-CBB0Kg-W.js → chunk-AQP2D5EJ-BgLpjpch.js} +1 -1
  13. package/dist/client/assets/{chunk-CSCIHK7Q-DyP7XTU4.js → chunk-CSCIHK7Q-CFV8R2WL.js} +1 -1
  14. package/dist/client/assets/{chunk-KSCS5N6A-DmaAlkHd.js → chunk-KSCS5N6A-B-5OABYB.js} +1 -1
  15. package/dist/client/assets/{chunk-L5ZTLDWV-BbCJcuw8.js → chunk-L5ZTLDWV-BEakyLfX.js} +1 -1
  16. package/dist/client/assets/{chunk-LZXEDZCA-CO4dUZ7T.js → chunk-LZXEDZCA-k1JqO5jl.js} +2 -2
  17. package/dist/client/assets/{chunk-ND2GUHAM-DdIScoxN.js → chunk-ND2GUHAM-CAvkgbq4.js} +1 -1
  18. package/dist/client/assets/{chunk-NZK2D7GU-CSayat4N.js → chunk-NZK2D7GU-B1XxeNv6.js} +1 -1
  19. package/dist/client/assets/{chunk-O5CBEL6O-DQ6-KxSx.js → chunk-O5CBEL6O-xsxGQlBc.js} +1 -1
  20. package/dist/client/assets/{chunk-WU5MYG2G-Bn4PvIOT.js → chunk-WU5MYG2G-D2RTcS5J.js} +1 -1
  21. package/dist/client/assets/classDiagram-4FO5ZUOK-CXujfiH2.js +1 -0
  22. package/dist/client/assets/classDiagram-v2-Q7XG4LA2-BpQoPe_W.js +1 -0
  23. package/dist/client/assets/{dagre-BM42HDAG-DF2DH2PP.js → dagre-BM42HDAG-DQRkT0rW.js} +1 -1
  24. package/dist/client/assets/{diagram-2AECGRRQ-h2YnBn5e.js → diagram-2AECGRRQ-DLxnmFG_.js} +1 -1
  25. package/dist/client/assets/{diagram-5GNKFQAL-CGIA2jQw.js → diagram-5GNKFQAL-Cu1nMouP.js} +1 -1
  26. package/dist/client/assets/{diagram-KO2AKTUF-DK3VRNEP.js → diagram-KO2AKTUF-BCpHrNi4.js} +1 -1
  27. package/dist/client/assets/{diagram-LMA3HP47-CkCAtpdf.js → diagram-LMA3HP47-CIM0-geo.js} +1 -1
  28. package/dist/client/assets/{diagram-OG6HWLK6-DaLX4wzh.js → diagram-OG6HWLK6-DV8jDGdy.js} +1 -1
  29. package/dist/client/assets/{erDiagram-TEJ5UH35-CkDWu9VZ.js → erDiagram-TEJ5UH35-C-5Pkrkl.js} +1 -1
  30. package/dist/client/assets/{flowDiagram-I6XJVG4X-DKzshKa9.js → flowDiagram-I6XJVG4X-CDPh9OIS.js} +1 -1
  31. package/dist/client/assets/{ganttDiagram-6RSMTGT7-CfcOUVzd.js → ganttDiagram-6RSMTGT7-jncsu8xZ.js} +1 -1
  32. package/dist/client/assets/{gitGraphDiagram-PVQCEYII-CveUq_fP.js → gitGraphDiagram-PVQCEYII-DGWMJkfX.js} +1 -1
  33. package/dist/client/assets/{index-D_brbG-0.css → index-C1ZNfkTu.css} +1 -1
  34. package/dist/client/assets/index-C8n_tSJG.js +293 -0
  35. package/dist/client/assets/{infoDiagram-5YYISTIA-CTBxib6d.js → infoDiagram-5YYISTIA-B4xDH_w0.js} +1 -1
  36. package/dist/client/assets/{ishikawaDiagram-YF4QCWOH--DkW1thK.js → ishikawaDiagram-YF4QCWOH-DVdd9VXs.js} +1 -1
  37. package/dist/client/assets/{journeyDiagram-JHISSGLW-BBXicnFC.js → journeyDiagram-JHISSGLW-nOtumTZv.js} +1 -1
  38. package/dist/client/assets/{kanban-definition-UN3LZRKU-BquOM7W0.js → kanban-definition-UN3LZRKU-DDOXGouj.js} +1 -1
  39. package/dist/client/assets/{line-DrikE93F.js → line-Bv23U4ui.js} +1 -1
  40. package/dist/client/assets/{mermaid-parser.core-DcxGTRm1.js → mermaid-parser.core-G9FbMuHU.js} +1 -1
  41. package/dist/client/assets/{mermaid.core-CRFw0uO2.js → mermaid.core-B3CWAqqw.js} +3 -3
  42. package/dist/client/assets/{mindmap-definition-RKZ34NQL-FFNhybFW.js → mindmap-definition-RKZ34NQL-DjSz56M7.js} +1 -1
  43. package/dist/client/assets/{pieDiagram-4H26LBE5-i6cMYse5.js → pieDiagram-4H26LBE5-DSWgdOVl.js} +1 -1
  44. package/dist/client/assets/{quadrantDiagram-W4KKPZXB-BYZQjQaz.js → quadrantDiagram-W4KKPZXB-DEupU1aE.js} +1 -1
  45. package/dist/client/assets/{requirementDiagram-4Y6WPE33-B4wEb1VZ.js → requirementDiagram-4Y6WPE33-BhBfAL0L.js} +1 -1
  46. package/dist/client/assets/{sankeyDiagram-5OEKKPKP-CT8mTepY.js → sankeyDiagram-5OEKKPKP-CbjG9Vw2.js} +1 -1
  47. package/dist/client/assets/{sequenceDiagram-3UESZ5HK-C6RFM__N.js → sequenceDiagram-3UESZ5HK-1Q4xZQSJ.js} +1 -1
  48. package/dist/client/assets/{stateDiagram-AJRCARHV-ew8CGdEw.js → stateDiagram-AJRCARHV-OtJd_YEY.js} +1 -1
  49. package/dist/client/assets/stateDiagram-v2-BHNVJYJU-Bkxwy8iL.js +1 -0
  50. package/dist/client/assets/{timeline-definition-PNZ67QCA-BOIWKsvL.js → timeline-definition-PNZ67QCA-CABkNCpN.js} +1 -1
  51. package/dist/client/assets/{vennDiagram-CIIHVFJN--dj48T5C.js → vennDiagram-CIIHVFJN-BC2gbfhD.js} +1 -1
  52. package/dist/client/assets/{wardleyDiagram-YWT4CUSO-Bpu8yneZ.js → wardleyDiagram-YWT4CUSO-Bkh5qr4Q.js} +1 -1
  53. package/dist/client/assets/{xychartDiagram-2RQKCTM6-CuqF6K-6.js → xychartDiagram-2RQKCTM6-BWDBD0AE.js} +1 -1
  54. package/dist/client/index.html +2 -2
  55. package/dist/server/index.js +2 -0
  56. package/dist/server/index.js.map +1 -1
  57. package/dist/server/lib/agent.js +43 -10
  58. package/dist/server/lib/agent.js.map +1 -1
  59. package/dist/server/lib/agentProvider.js.map +1 -1
  60. package/dist/server/lib/codexUpgrade.js +193 -0
  61. package/dist/server/lib/codexUpgrade.js.map +1 -0
  62. package/dist/server/lib/i18n/resources.js +3 -0
  63. package/dist/server/lib/i18n/resources.js.map +1 -1
  64. package/dist/server/lib/opencodeAgentProvider.js +11 -1
  65. package/dist/server/lib/opencodeAgentProvider.js.map +1 -1
  66. package/dist/server/lib/opencodeApprovalContext.js +38 -0
  67. package/dist/server/lib/opencodeApprovalContext.js.map +1 -0
  68. package/dist/server/lib/opencodeApprovalLifecycle.js +49 -0
  69. package/dist/server/lib/opencodeApprovalLifecycle.js.map +1 -0
  70. package/dist/server/lib/opencodeApprovalRoutes.js +51 -0
  71. package/dist/server/lib/opencodeApprovalRoutes.js.map +1 -0
  72. package/dist/server/lib/opencodeApprovalSchema.js +31 -0
  73. package/dist/server/lib/opencodeApprovalSchema.js.map +1 -0
  74. package/dist/server/lib/opencodeApprovalTransport.js +713 -0
  75. package/dist/server/lib/opencodeApprovalTransport.js.map +1 -0
  76. package/dist/server/lib/opencodeApprovalTypes.js +2 -0
  77. package/dist/server/lib/opencodeApprovalTypes.js.map +1 -0
  78. package/dist/server/lib/opencodeToolApprovals.js +371 -0
  79. package/dist/server/lib/opencodeToolApprovals.js.map +1 -0
  80. package/dist/server/lib/planModeQuestions.js +4 -0
  81. package/dist/server/lib/planModeQuestions.js.map +1 -1
  82. package/dist/server/lib/restrictedFilePrompt.js +11 -3
  83. package/dist/server/lib/restrictedFilePrompt.js.map +1 -1
  84. package/dist/server/lib/reviewAgentWatchdog.js +5 -5
  85. package/dist/server/lib/reviewAgentWatchdog.js.map +1 -1
  86. package/dist/server/lib/reviewPromptContext.js +5 -3
  87. package/dist/server/lib/reviewPromptContext.js.map +1 -1
  88. package/dist/server/lib/specArtifact.js +29 -0
  89. package/dist/server/lib/specArtifact.js.map +1 -1
  90. package/dist/server/lib/toolUpgrade.js +4 -1
  91. package/dist/server/lib/toolUpgrade.js.map +1 -1
  92. package/dist/server/workers/plan.js +47 -41
  93. package/dist/server/workers/plan.js.map +1 -1
  94. package/dist/server/workers/specArtifactContract.js +40 -0
  95. package/dist/server/workers/specArtifactContract.js.map +1 -0
  96. package/dist/server/workers/specSession.js +1 -37
  97. package/dist/server/workers/specSession.js.map +1 -1
  98. package/package.json +1 -1
  99. package/dist/client/assets/VerificationDialog-D6Sr1Hpi.js +0 -4
  100. package/dist/client/assets/channel-CRzDiEyE.js +0 -1
  101. package/dist/client/assets/classDiagram-4FO5ZUOK-ydg4crE2.js +0 -1
  102. package/dist/client/assets/classDiagram-v2-Q7XG4LA2-C8542ymn.js +0 -1
  103. package/dist/client/assets/index-DRMy2cc2.js +0 -293
  104. package/dist/client/assets/stateDiagram-v2-BHNVJYJU-DkUI5gTZ.js +0 -1
@@ -1,3 +1,4 @@
1
+ import { translateServerMessage } from './i18n/index.js';
1
2
  const SPEC_ARTIFACT_TAG = 'archon-spec-artifact';
2
3
  const SPEC_GRILL_QUESTION_TAG = 'archon-grill-question';
3
4
  const normalizeRequiredString = (value) => {
@@ -75,6 +76,23 @@ const normalizeSnapshotTickets = (value) => {
75
76
  }))
76
77
  .filter(item => item.key && item.title && item.description);
77
78
  };
79
+ const getDependencyValidationError = (value) => {
80
+ if (!Array.isArray(value)) {
81
+ return null;
82
+ }
83
+ for (const [index, item] of value.entries()) {
84
+ if (!item || typeof item !== 'object' || Array.isArray(item)) {
85
+ return translateServerMessage('specArtifact.invalidDependency', { index });
86
+ }
87
+ const edge = item;
88
+ const blocker = normalizeRequiredString(edge.blocker_key);
89
+ const dependent = normalizeRequiredString(edge.dependent_key);
90
+ if (!blocker || !dependent || blocker === dependent) {
91
+ return translateServerMessage('specArtifact.invalidDependency', { index });
92
+ }
93
+ }
94
+ return null;
95
+ };
78
96
  const normalizeSnapshotDependencies = (value) => {
79
97
  if (!Array.isArray(value)) {
80
98
  return [];
@@ -236,6 +254,17 @@ export const extractSpecArtifactFromOutput = (output) => {
236
254
  diagnostic: null,
237
255
  };
238
256
  }
257
+ const dependencyError = getDependencyValidationError(parsedRecord.dependencies);
258
+ if (dependencyError) {
259
+ return {
260
+ cleanedOutput: stripSpecArtifactBlock(output),
261
+ artifact: null,
262
+ presence: null,
263
+ error: dependencyError,
264
+ failureCode: 'invalid_dependencies',
265
+ diagnostic: dependencyError,
266
+ };
267
+ }
239
268
  // Presence is derived from the raw parsed value, before normalization, so the
240
269
  // resolver can tell "LLM omitted this field" (carry forward) apart from "LLM
241
270
  // emitted an empty array" (deliberate clear). Only well-formed arrays count as
@@ -1 +1 @@
1
- {"version":3,"file":"specArtifact.js","sourceRoot":"","sources":["../../../server/lib/specArtifact.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"specArtifact.js","sourceRoot":"","sources":["../../../server/lib/specArtifact.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,12 @@
1
1
  import { execFile } from 'child_process';
2
2
  import { getHostAgentAvailability } from './agentCatalog.js';
3
+ import { upgradeInstalledCodex } from './codexUpgrade.js';
3
4
  import { getOpencodeCliCompatibility, invalidateOpencodeCliCapabilityCache, OpencodeCompatibilityError, OPENCODE_V1_REGRESSION_BASELINE, OPENCODE_V2_FIXTURE_BASELINE, } from './opencodeCli.js';
4
5
  const UPGRADE_TIMEOUT_MS = 5 * 60 * 1000;
5
6
  const MAX_BUFFER = 4 * 1024 * 1024;
6
7
  const OUTPUT_TAIL_LENGTH = 2000;
7
8
  const TOOL_COMMANDS = {
8
9
  claude: { command: 'claude', args: ['update'] },
9
- codex: { command: 'npm', args: ['install', '--global', '@openai/codex@latest'] },
10
10
  };
11
11
  const OPENCODE_QUALIFIED_UPGRADE_TARGETS = Object.freeze({
12
12
  1: OPENCODE_V1_REGRESSION_BASELINE,
@@ -160,6 +160,9 @@ export const upgradeTool = async (tool, options = {}) => {
160
160
  invalidateOpencodeCliCapabilityCache();
161
161
  }
162
162
  }
163
+ if (tool === 'codex') {
164
+ return await upgradeInstalledCodex();
165
+ }
163
166
  return await runUpgradeProcess(tool, TOOL_COMMANDS[tool]);
164
167
  }
165
168
  finally {
@@ -1 +1 @@
1
- {"version":3,"file":"toolUpgrade.js","sourceRoot":"","sources":["../../../server/lib/toolUpgrade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolUpgrade.js","sourceRoot":"","sources":["../../../server/lib/toolUpgrade.ts"],"names":[],"mappings":"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"}
@@ -43,6 +43,7 @@ import { createHostLauncherEnvironment, createLegacyHostRuntimeEnvironment } fro
43
43
  import { hostExecutionEnvironment } from '../lib/hostExecutionEnvironment.js';
44
44
  import { enrichPromptWithPreview } from '../lib/agentPreview.js';
45
45
  import { appendRestrictedFilePrompt } from '../lib/restrictedFilePrompt.js';
46
+ import { createOpencodeApprovalClock, prepareOpencodeApprovalPrompt, resolveOpencodeApprovalContext } from '../lib/opencodeApprovalContext.js';
46
47
  const resolvePlannerAgentRunParent = (options) => {
47
48
  if (options.agentRunParent) {
48
49
  return options.agentRunParent;
@@ -53,6 +54,7 @@ const resolvePlannerAgentRunParent = (options) => {
53
54
  return undefined;
54
55
  };
55
56
  const plannerExecutionOptions = (options) => ({
57
+ opencodeApprovalContext: options.opencodeApprovalContext,
56
58
  executionProvider: options.executionProvider,
57
59
  executionTarget: options.executionTarget,
58
60
  executionLauncherEnvironment: options.executionLauncherEnvironment,
@@ -1047,6 +1049,20 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1047
1049
  let spawnTimestamp = null;
1048
1050
  let sessionLookupTimer = null;
1049
1051
  let hasResolvedSessionId = Boolean(sessionTracking?.resumeSessionId);
1052
+ const streamingRequest = {
1053
+ cwd: sessionDirectory,
1054
+ prompt: finalPrompt,
1055
+ model: resolvedModel || null,
1056
+ variant,
1057
+ skills: options.skills,
1058
+ mode: 'plan',
1059
+ resumeSessionId: sessionTracking?.resumeSessionId ?? null,
1060
+ sessionId: randomUUID(),
1061
+ opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
1062
+ opencodeCompatibility: resolvedOpencodeCompatibility,
1063
+ opencodeApprovalContext: options.opencodeApprovalContext,
1064
+ };
1065
+ const approvalClock = createOpencodeApprovalClock(options.opencodeApprovalContext);
1050
1066
  const [cmd, args, stdio] = tool === 'claude'
1051
1067
  ? (() => {
1052
1068
  if (!sessionTracking) {
@@ -1070,31 +1086,11 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1070
1086
  })()
1071
1087
  : tool === 'codex'
1072
1088
  ? (() => {
1073
- const invocation = codexAgentProvider.buildStreamingInvocation({
1074
- cwd: cwd ?? process.cwd(),
1075
- prompt: finalPrompt,
1076
- model: resolvedModel || null,
1077
- variant,
1078
- skills: options.skills,
1079
- mode: 'plan',
1080
- resumeSessionId: sessionTracking?.resumeSessionId ?? null,
1081
- sessionId: randomUUID(),
1082
- });
1089
+ const invocation = codexAgentProvider.buildStreamingInvocation(streamingRequest);
1083
1090
  return [invocation.command, [...invocation.args], invocation.stdio];
1084
1091
  })()
1085
1092
  : (() => {
1086
- const invocation = opencodeAgentProvider.buildStreamingInvocation({
1087
- cwd: cwd ?? process.cwd(),
1088
- prompt: finalPrompt,
1089
- model: resolvedModel || null,
1090
- variant,
1091
- skills: options.skills,
1092
- mode: 'plan',
1093
- resumeSessionId: sessionTracking?.resumeSessionId ?? null,
1094
- sessionId: randomUUID(),
1095
- opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
1096
- opencodeCompatibility: resolvedOpencodeCompatibility,
1097
- });
1093
+ const invocation = opencodeAgentProvider.buildStreamingInvocation(streamingRequest);
1098
1094
  return [invocation.command, [...invocation.args], invocation.stdio];
1099
1095
  })();
1100
1096
  return new Promise((resolve, reject) => {
@@ -1102,7 +1098,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1102
1098
  let completionForced = false;
1103
1099
  let hardTimeoutForced = false;
1104
1100
  let resolvedSessionId = sessionTracking?.resumeSessionId ?? null;
1105
- let lastStdoutAt = Date.now();
1101
+ let lastStdoutAt = approvalClock.now();
1106
1102
  let watchdogTimer = null;
1107
1103
  const subagentTracker = options.agentRunParent
1108
1104
  ? createSubagentRunTracker({
@@ -1219,17 +1215,9 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1219
1215
  return;
1220
1216
  }
1221
1217
  activePlannerProcesses.add(child);
1222
- if (tool === 'codex') {
1223
- const connection = codexAgentProvider.connectStreamingInvocation?.(child, {
1224
- cwd: cwd ?? process.cwd(),
1225
- prompt: finalPrompt,
1226
- model: resolvedModel || null,
1227
- variant,
1228
- skills: options.skills,
1229
- mode: 'plan',
1230
- resumeSessionId: sessionTracking?.resumeSessionId ?? null,
1231
- sessionId: randomUUID(),
1232
- }, {
1218
+ if (tool === 'codex' || (tool === 'opencode' && options.opencodeApprovalContext)) {
1219
+ const provider = tool === 'codex' ? codexAgentProvider : opencodeAgentProvider;
1220
+ const connection = provider.connectStreamingInvocation?.(child, streamingRequest, {
1233
1221
  runtimeEnvironmentKind: options.executionRuntimeEnvironment?.kind ?? 'host',
1234
1222
  });
1235
1223
  if (connection) {
@@ -1291,6 +1279,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1291
1279
  let concatenatingResponseGroup;
1292
1280
  const logIndexesByGroup = new Map();
1293
1281
  const startTime = Date.now();
1282
+ const watchdogStartedAt = approvalClock.now();
1294
1283
  let firstFinalAnswerTime = null;
1295
1284
  const emitProgress = () => {
1296
1285
  const progress = {
@@ -1305,7 +1294,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1305
1294
  const outputStream = providerStdout ?? child.stdout;
1306
1295
  outputStream?.on('data', (chunk) => {
1307
1296
  stdoutChunks.push(chunk);
1308
- lastStdoutAt = Date.now();
1297
+ lastStdoutAt = approvalClock.now();
1309
1298
  const text = remainder + chunk.toString();
1310
1299
  const lines = text.split('\n');
1311
1300
  remainder = lines.pop() ?? '';
@@ -1532,11 +1521,11 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1532
1521
  if (tool === 'opencode') {
1533
1522
  let watchdogReadInFlight = false;
1534
1523
  const runWatchdog = async () => {
1535
- if (settled) {
1524
+ if (settled || approvalClock.isPending()) {
1536
1525
  return;
1537
1526
  }
1538
- const now = Date.now();
1539
- if (now - startTime >= PLANNER_HARD_TIMEOUT_MS) {
1527
+ const now = approvalClock.now();
1528
+ if (now - watchdogStartedAt >= PLANNER_HARD_TIMEOUT_MS) {
1540
1529
  clearWatchdogTimer();
1541
1530
  hardTimeoutForced = true;
1542
1531
  killPlannerProcess(child, 'SIGTERM');
@@ -1557,7 +1546,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1557
1546
  const completed = await opencodeSessionOperations.hasCompletedAssistantSince(resolvedSessionId, spawnTimestamp)
1558
1547
  .catch(() => false);
1559
1548
  watchdogReadInFlight = false;
1560
- if (settled) {
1549
+ if (settled || approvalClock.isPending()) {
1561
1550
  return;
1562
1551
  }
1563
1552
  if (completed) {
@@ -1572,16 +1561,25 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
1572
1561
  });
1573
1562
  };
1574
1563
  export const runPlannerPrompt = (tool, model, variant, prompt, cwd, options = {}) => {
1564
+ const parent = options.agentRunParent;
1565
+ const opencodeApprovalContext = tool === 'opencode' ? options.opencodeApprovalContext ?? resolveOpencodeApprovalContext({
1566
+ tool,
1567
+ parentKind: parent?.parentType ?? 'ticket',
1568
+ parentId: parent?.parentId ?? options.sessionTracking?.ticketId ?? '',
1569
+ executionContext: options.executionContext,
1570
+ io: parent?.io ?? options.sessionTracking?.io,
1571
+ }) : undefined;
1572
+ const preparedOptions = { ...options, opencodeApprovalContext };
1575
1573
  const launch = (enrichedPrompt) => {
1576
1574
  const run = () => {
1577
1575
  if (options.cancellationState?.stopRequested) {
1578
1576
  return Promise.reject(new Error('Planning was stopped.'));
1579
1577
  }
1580
- return runPlannerPromptOnce(tool, model, variant, enrichedPrompt, cwd, options);
1578
+ return runPlannerPromptOnce(tool, model, variant, enrichedPrompt, cwd, preparedOptions);
1581
1579
  };
1582
1580
  return tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
1583
1581
  };
1584
- const enrichedPrompt = enrichPromptWithPreview(appendRestrictedFilePrompt(prompt), options.executionContext, options.executionTarget);
1582
+ const enrichedPrompt = enrichPromptWithPreview(prepareOpencodeApprovalPrompt(appendRestrictedFilePrompt(prompt), opencodeApprovalContext), options.executionContext, options.executionTarget);
1585
1583
  return typeof enrichedPrompt === 'string'
1586
1584
  ? launch(enrichedPrompt)
1587
1585
  : enrichedPrompt.then(launch);
@@ -1878,6 +1876,7 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
1878
1876
  const { output } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, prependSkillPromptBlock(buildLinkedProjectResearchPrompt(project, linkedProject, request), options.skills ?? []), linkedProject.repo_path, {
1879
1877
  skills: options.skills,
1880
1878
  agentRunParent: resolvePlannerAgentRunParent(options),
1879
+ opencodeApprovalContext: options.opencodeApprovalContext,
1881
1880
  cancellationState: options.cancellationState,
1882
1881
  ...(legacyInvocation ? { mainRun: legacyInvocation } : {}),
1883
1882
  });
@@ -1966,6 +1965,13 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
1966
1965
  ? { parentType: 'planning', parentId: linkedProject.id, io: options.agentRunParent.io }
1967
1966
  : undefined,
1968
1967
  executionContext: childContext,
1968
+ opencodeApprovalContext: options.opencodeApprovalContext ?? resolveOpencodeApprovalContext({
1969
+ tool,
1970
+ parentKind: resolvePlannerAgentRunParent(options)?.parentType ?? '',
1971
+ parentId: resolvePlannerAgentRunParent(options)?.parentId ?? '',
1972
+ executionContext: parentContext,
1973
+ io: options.agentRunParent?.io ?? options.io,
1974
+ }),
1969
1975
  cancellationState: options.cancellationState,
1970
1976
  executionProvider: childEnvironment.provider,
1971
1977
  executionTarget,