@staff0rd/assist 0.1143.3 → 0.1144.0
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.
- package/dist/{addActivity-XDHJ7CV5.js → addActivity-I7GIFLOG.js} +4 -3
- package/dist/{addPhase-XZO6BH26.js → addPhase-GP6MKXBN.js} +4 -4
- package/dist/{advise-YDAJA5NI.js → advise-XTXF7CRD.js} +5 -4
- package/dist/{askCheck-WILQF3JN.js → askCheck-RF2R5NDL.js} +8 -8
- package/dist/{askDesign-RDIXLTMM.js → askDesign-CWDKITEU.js} +2 -2
- package/dist/{branch-7NZ5K4AI.js → branch-BSRUVE6O.js} +5 -4
- package/dist/built-version +1 -1
- package/dist/{chunk-GQMP5NS4.js → chunk-27QYXLBO.js} +2 -2
- package/dist/{chunk-LGMCQUJJ.js → chunk-2RVFQMCT.js} +1 -1
- package/dist/{chunk-UJX7N737.js → chunk-36WX4PU4.js} +1 -1
- package/dist/{chunk-F2GXOU5H.js → chunk-3A7RM7ZE.js} +1 -1
- package/dist/{chunk-IDFJE5DP.js → chunk-3DR7FGAL.js} +1 -1
- package/dist/{chunk-S3I6PZTN.js → chunk-4VYZIWCE.js} +1 -1
- package/dist/{chunk-CSQLE62N.js → chunk-537DMVPK.js} +7 -7
- package/dist/{chunk-VQZVG7KJ.js → chunk-56PNBMBF.js} +1 -1
- package/dist/{chunk-XGG4NZLE.js → chunk-64LIWSXE.js} +4 -4
- package/dist/{chunk-OUT62LF4.js → chunk-67B7TFAR.js} +3 -3
- package/dist/{chunk-M3QEBIQL.js → chunk-67KU5YDY.js} +1 -1
- package/dist/{chunk-O6GPPB6G.js → chunk-6ETLOAOY.js} +1 -1
- package/dist/{chunk-QDQ6A2MZ.js → chunk-6JDTHFNG.js} +2 -2
- package/dist/{chunk-GLIYWSW7.js → chunk-72H6JXNZ.js} +2 -2
- package/dist/{chunk-5CCCIT5E.js → chunk-75CTEDPY.js} +1 -1
- package/dist/{chunk-VNPRH5XZ.js → chunk-7HBWHGRO.js} +1 -1
- package/dist/{chunk-Z76MGO4R.js → chunk-B23UXJO4.js} +1 -1
- package/dist/{chunk-STUWMYJ3.js → chunk-B5IBWXPS.js} +113 -7
- package/dist/{chunk-AWAUWR2H.js → chunk-CRLEUURN.js} +4 -2
- package/dist/{chunk-7ZN4KX7V.js → chunk-FDWIKBS3.js} +5 -1
- package/dist/{chunk-PNOSR4S4.js → chunk-G4KTQ3BM.js} +1 -1
- package/dist/{chunk-IRUDR6GR.js → chunk-HFIYMKDD.js} +1 -1
- package/dist/{chunk-66EUBGD6.js → chunk-HO7RNI6V.js} +1 -8
- package/dist/{chunk-7MUAIGYQ.js → chunk-HWAB2RV6.js} +1 -1
- package/dist/{chunk-WIG7VKXE.js → chunk-J4XULYFC.js} +1 -1
- package/dist/{chunk-43GYFW24.js → chunk-JH6U6MSA.js} +1 -1
- package/dist/{chunk-S4Y7TLRT.js → chunk-KMO2Y4KT.js} +1 -1
- package/dist/{chunk-Q55RN3EG.js → chunk-MYBNV4GH.js} +1 -1
- package/dist/{chunk-46B7OBV4.js → chunk-P56ZEVAK.js} +1 -1
- package/dist/{chunk-J7XASX4N.js → chunk-QRAZBFDX.js} +6 -6
- package/dist/{chunk-EF7AXKON.js → chunk-R5JL5IV5.js} +1 -1
- package/dist/{chunk-T5WE33UZ.js → chunk-SMOEJN6Q.js} +1 -1
- package/dist/{chunk-Y46IKU4U.js → chunk-VM36UNH3.js} +1 -1
- package/dist/{chunk-FFKJYEDJ.js → chunk-WMNOK5D7.js} +2 -2
- package/dist/{chunk-O5NYB4W5.js → chunk-WS2Q37KC.js} +1 -1
- package/dist/{chunk-R33SW6V2.js → chunk-XGKRZDFC.js} +1 -1
- package/dist/{cliHook-QGUENERI.js → cliHook-EOOXUGBR.js} +6 -6
- package/dist/{cliHookCheck-VLLUDLZD.js → cliHookCheck-X5TCXO6W.js} +4 -3
- package/dist/{codexHook-24HGGAM3.js → codexHook-I62GDJUK.js} +8 -8
- package/dist/commands/sessions/web/bundle.js +24 -24
- package/dist/{commit-OWV2KIOD.js → commit-QIBKZOFC.js} +5 -4
- package/dist/{doctorNodes-KURLWXJF.js → doctorNodes-YRGXROLM.js} +3 -3
- package/dist/{done-ZQCDA2OJ.js → done-YRYUU3NC.js} +6 -5
- package/dist/{editHook-YPYSRJLU.js → editHook-7I2OJPWT.js} +6 -6
- package/dist/{fixConflict-SW33MRTL.js → fixConflict-AEEBWBWC.js} +3 -3
- package/dist/{harnessFollowUps-PNR55PM4.js → harnessFollowUps-GZP2FYFR.js} +1 -1
- package/dist/index.js +55 -55
- package/dist/{launchMode-VKS5XM4V.js → launchMode-A745H5WI.js} +14 -14
- package/dist/{list-OWWW2G36.js → list-KMUEPWIX.js} +7 -6
- package/dist/{next-XRXA7ZLN.js → next-FMKPU3RP.js} +13 -13
- package/dist/{piHook-WWYLIELZ.js → piHook-K4KQQES3.js} +6 -6
- package/dist/{propose-PYAPK2PU.js → propose-UEOA2URJ.js} +5 -5
- package/dist/{refine-NAJUWIFV.js → refine-3BKZV7WL.js} +15 -15
- package/dist/{resolveHarness-A3F7CDF2.js → resolveHarness-Q6HQK2IZ.js} +1 -1
- package/dist/{resolveModel-GHXLN2T4.js → resolveModel-EPG2YC5Q.js} +1 -1
- package/dist/{restartNode-GAM4QS3V.js → restartNode-ODAWZVRV.js} +5 -5
- package/dist/{review-IXQ67Q2I.js → review-QRWNEL36.js} +3 -3
- package/dist/{reviewPrComments-YELGPQIH.js → reviewPrComments-T4BB75Q5.js} +3 -3
- package/dist/{rewindPhase-RKEURCE5.js → rewindPhase-GCXULF2L.js} +10 -9
- package/dist/{run-JEUQGX5U.js → run-FOMNDLIE.js} +11 -11
- package/dist/{run-KI7FYVOY.js → run-S3QVJV6F.js} +11 -11
- package/dist/{runDaemon-WNUM5HUG.js → runDaemon-T4JIISAT.js} +293 -32
- package/dist/{runRefine-DWJATWCB.js → runRefine-A7R2BRLS.js} +16 -16
- package/dist/{scan-VM2LYP6W.js → scan-ZBIMTQVA.js} +4 -3
- package/dist/{schemaConfirm-WZCBGM7A.js → schemaConfirm-OP4CP3ZH.js} +4 -3
- package/dist/{schemaUnlock-JKXSG6BI.js → schemaUnlock-XYFV4DAQ.js} +3 -3
- package/dist/{search-HLB25O4S.js → search-APR5DBRZ.js} +7 -6
- package/dist/{show-SPEIA7AL.js → show-6HKO23WP.js} +4 -4
- package/dist/{show-65RGZKWW.js → show-S7GB6IH2.js} +5 -4
- package/dist/{signExtension-VF34F7UR.js → signExtension-FY2C3R3D.js} +1 -1
- package/dist/{updateNode-4IYWN3MS.js → updateNode-OFM7MZQH.js} +5 -5
- package/dist/{updatePlan-RV77RV4J.js → updatePlan-SMFHMXGN.js} +5 -5
- package/dist/{web-3X54NV64.js → web-D64ETRT6.js} +17 -17
- package/dist/{web-XW33SYEX.js → web-XX4W442Y.js} +17 -17
- package/package.json +1 -1
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
formatScanUsage,
|
|
32
32
|
inboxScanBlocker,
|
|
33
33
|
runInboxScan
|
|
34
|
-
} from "./chunk-
|
|
34
|
+
} from "./chunk-4VYZIWCE.js";
|
|
35
35
|
import "./chunk-2JYMVJGZ.js";
|
|
36
36
|
import {
|
|
37
37
|
showNotification
|
|
@@ -48,7 +48,7 @@ import {
|
|
|
48
48
|
recordPhaseSession,
|
|
49
49
|
releaseLock,
|
|
50
50
|
requestPause
|
|
51
|
-
} from "./chunk-
|
|
51
|
+
} from "./chunk-R5JL5IV5.js";
|
|
52
52
|
import {
|
|
53
53
|
buildResumePrompt
|
|
54
54
|
} from "./chunk-5PKWV3WT.js";
|
|
@@ -68,12 +68,12 @@ import {
|
|
|
68
68
|
import {
|
|
69
69
|
OneShotUnavailableError,
|
|
70
70
|
runOneShotPrompt
|
|
71
|
-
} from "./chunk-
|
|
71
|
+
} from "./chunk-MYBNV4GH.js";
|
|
72
72
|
import {
|
|
73
73
|
locateConversation,
|
|
74
74
|
readTranscriptHead,
|
|
75
75
|
transcriptMessages
|
|
76
|
-
} from "./chunk-
|
|
76
|
+
} from "./chunk-HFIYMKDD.js";
|
|
77
77
|
import {
|
|
78
78
|
toAttachments
|
|
79
79
|
} from "./chunk-BAHQJHYD.js";
|
|
@@ -97,7 +97,7 @@ import {
|
|
|
97
97
|
toNodeSessionId,
|
|
98
98
|
usageWindowKey,
|
|
99
99
|
watcherLogPath
|
|
100
|
-
} from "./chunk-
|
|
100
|
+
} from "./chunk-CRLEUURN.js";
|
|
101
101
|
import {
|
|
102
102
|
newTraceId
|
|
103
103
|
} from "./chunk-4HKB2TAG.js";
|
|
@@ -109,7 +109,7 @@ import {
|
|
|
109
109
|
isHello,
|
|
110
110
|
linkVersionCheck,
|
|
111
111
|
negotiateProtocol
|
|
112
|
-
} from "./chunk-
|
|
112
|
+
} from "./chunk-36WX4PU4.js";
|
|
113
113
|
import {
|
|
114
114
|
loadLinkSpecs
|
|
115
115
|
} from "./chunk-HHKS3UZB.js";
|
|
@@ -124,7 +124,7 @@ import "./chunk-XV2STPP6.js";
|
|
|
124
124
|
import {
|
|
125
125
|
conversationOf,
|
|
126
126
|
lookupConversation
|
|
127
|
-
} from "./chunk-
|
|
127
|
+
} from "./chunk-2RVFQMCT.js";
|
|
128
128
|
import {
|
|
129
129
|
stripAnsi
|
|
130
130
|
} from "./chunk-YJ72SXVD.js";
|
|
@@ -166,9 +166,9 @@ import {
|
|
|
166
166
|
} from "./chunk-QAJUCN3A.js";
|
|
167
167
|
import {
|
|
168
168
|
resolvePlan
|
|
169
|
-
} from "./chunk-
|
|
170
|
-
import "./chunk-
|
|
171
|
-
import "./chunk-
|
|
169
|
+
} from "./chunk-P56ZEVAK.js";
|
|
170
|
+
import "./chunk-KMO2Y4KT.js";
|
|
171
|
+
import "./chunk-3DR7FGAL.js";
|
|
172
172
|
import {
|
|
173
173
|
loadItem
|
|
174
174
|
} from "./chunk-U732RAGX.js";
|
|
@@ -194,7 +194,7 @@ import {
|
|
|
194
194
|
runConfigBaseDirFrom
|
|
195
195
|
} from "./chunk-QR7KY3Y6.js";
|
|
196
196
|
import "./chunk-NZYSENRR.js";
|
|
197
|
-
import "./chunk-
|
|
197
|
+
import "./chunk-75CTEDPY.js";
|
|
198
198
|
import "./chunk-MELBVXKL.js";
|
|
199
199
|
import {
|
|
200
200
|
resolveCapability
|
|
@@ -205,17 +205,24 @@ import {
|
|
|
205
205
|
discoverSessionJsonlPaths,
|
|
206
206
|
emptyScanUsage,
|
|
207
207
|
harnessAdapter,
|
|
208
|
+
killSdkChild,
|
|
209
|
+
noopDisposable,
|
|
208
210
|
parseRolloutEntry,
|
|
209
211
|
parseSessionFile,
|
|
210
212
|
readTranscriptTail,
|
|
211
213
|
readTranscriptTailSync,
|
|
214
|
+
refuseMissingCwd,
|
|
212
215
|
rememberViewerSize,
|
|
216
|
+
resolvePtyCommand,
|
|
213
217
|
rolloutPayload,
|
|
214
218
|
rolloutString,
|
|
219
|
+
sdkTerminalStub,
|
|
220
|
+
sessionChildEnv,
|
|
215
221
|
setSdkUsageSink,
|
|
222
|
+
spawnClaudeSdk,
|
|
216
223
|
spawnPty,
|
|
217
224
|
viewerSize
|
|
218
|
-
} from "./chunk-
|
|
225
|
+
} from "./chunk-B5IBWXPS.js";
|
|
219
226
|
import {
|
|
220
227
|
daemonLog,
|
|
221
228
|
recentDaemonLogLines,
|
|
@@ -224,7 +231,7 @@ import {
|
|
|
224
231
|
} from "./chunk-MRUIXQXS.js";
|
|
225
232
|
import {
|
|
226
233
|
harnessCapabilityDeclarations
|
|
227
|
-
} from "./chunk-
|
|
234
|
+
} from "./chunk-HO7RNI6V.js";
|
|
228
235
|
import "./chunk-DIAC4XYA.js";
|
|
229
236
|
import "./chunk-UU77KEL6.js";
|
|
230
237
|
import "./chunk-W7TRZLEM.js";
|
|
@@ -239,7 +246,7 @@ import {
|
|
|
239
246
|
import "./chunk-APZ6ZTDA.js";
|
|
240
247
|
import "./chunk-BFQSGIN6.js";
|
|
241
248
|
import "./chunk-D7UZLH36.js";
|
|
242
|
-
import "./chunk-
|
|
249
|
+
import "./chunk-7HBWHGRO.js";
|
|
243
250
|
import "./chunk-EW2ZM2PC.js";
|
|
244
251
|
import "./chunk-QKHOYKUQ.js";
|
|
245
252
|
import {
|
|
@@ -276,7 +283,9 @@ import {
|
|
|
276
283
|
import {
|
|
277
284
|
assistConfigSchema
|
|
278
285
|
} from "./chunk-YXXKT6LL.js";
|
|
279
|
-
import
|
|
286
|
+
import {
|
|
287
|
+
harnessKinds
|
|
288
|
+
} from "./chunk-USKD27FY.js";
|
|
280
289
|
import "./chunk-HN7MFXZ7.js";
|
|
281
290
|
import "./chunk-DZGYHAE7.js";
|
|
282
291
|
import {
|
|
@@ -5096,6 +5105,172 @@ function freshPlan(session, adapter, prompt) {
|
|
|
5096
5105
|
};
|
|
5097
5106
|
}
|
|
5098
5107
|
|
|
5108
|
+
// src/commands/sessions/daemon/assistArgsHarness.ts
|
|
5109
|
+
function flagValue(args) {
|
|
5110
|
+
const index = args.indexOf("--harness");
|
|
5111
|
+
if (index !== -1) return args[index + 1];
|
|
5112
|
+
return args.find((arg) => arg.startsWith("--harness="))?.slice(10);
|
|
5113
|
+
}
|
|
5114
|
+
function defaultsType(args) {
|
|
5115
|
+
if (args[0] === "draft" || args[0] === "bug") return args[0];
|
|
5116
|
+
if (args[0] === "next" || args[0] === "backlog" && args[1] === "run")
|
|
5117
|
+
return "run";
|
|
5118
|
+
return void 0;
|
|
5119
|
+
}
|
|
5120
|
+
function isHarnessKind(value) {
|
|
5121
|
+
return harnessKinds.includes(value);
|
|
5122
|
+
}
|
|
5123
|
+
function assistArgsHarness(args, cwd) {
|
|
5124
|
+
const value = flagValue(args);
|
|
5125
|
+
if (value) return isHarnessKind(value) ? value : void 0;
|
|
5126
|
+
try {
|
|
5127
|
+
const { harness } = loadConfigFrom(cwd ?? process.cwd());
|
|
5128
|
+
const type = defaultsType(args);
|
|
5129
|
+
return type && harness.defaults?.[type]?.harness || harness.engine;
|
|
5130
|
+
} catch (error) {
|
|
5131
|
+
daemonLog(
|
|
5132
|
+
`assist ${args.join(" ")}: harness not resolved from config (${error instanceof Error ? error.message : String(error)})`
|
|
5133
|
+
);
|
|
5134
|
+
return void 0;
|
|
5135
|
+
}
|
|
5136
|
+
}
|
|
5137
|
+
|
|
5138
|
+
// src/commands/sessions/daemon/sdk/createSdkRelay.ts
|
|
5139
|
+
function createSdkRelay(label) {
|
|
5140
|
+
const listeners = [];
|
|
5141
|
+
let current;
|
|
5142
|
+
const emit = (event) => {
|
|
5143
|
+
for (const listener of listeners) listener(event);
|
|
5144
|
+
};
|
|
5145
|
+
const dropped = (action) => daemonLog(
|
|
5146
|
+
`${label} sdk ${action} dropped: no Claude (SDK) query is attached to this workflow`
|
|
5147
|
+
);
|
|
5148
|
+
const detach = (query) => {
|
|
5149
|
+
if (current !== query) return;
|
|
5150
|
+
current = void 0;
|
|
5151
|
+
daemonLog(`${label} sdk query detached from workflow`);
|
|
5152
|
+
emit({ kind: "activity", text: null });
|
|
5153
|
+
emit({ kind: "queued", texts: [] });
|
|
5154
|
+
emit({ kind: "background", tasks: [] });
|
|
5155
|
+
emit({ kind: "interrupting", pending: false });
|
|
5156
|
+
};
|
|
5157
|
+
const handle = {
|
|
5158
|
+
onEvent: (listener) => listeners.push(listener),
|
|
5159
|
+
send: (text) => current?.sdk ? current.sdk.send(text) : dropped("message"),
|
|
5160
|
+
interrupt: () => current?.sdk ? current.sdk.interrupt() : dropped("interrupt"),
|
|
5161
|
+
attach: (query, idle) => {
|
|
5162
|
+
current = query;
|
|
5163
|
+
daemonLog(
|
|
5164
|
+
`${label} sdk query attached to workflow${idle ? ", awaiting input" : ""}`
|
|
5165
|
+
);
|
|
5166
|
+
query.sdk?.onEvent((event) => {
|
|
5167
|
+
if (current === query) emit(event);
|
|
5168
|
+
});
|
|
5169
|
+
query.onExit(() => detach(query));
|
|
5170
|
+
if (idle) emit({ kind: "status", status: "waiting" });
|
|
5171
|
+
}
|
|
5172
|
+
};
|
|
5173
|
+
return { handle, current: () => current };
|
|
5174
|
+
}
|
|
5175
|
+
|
|
5176
|
+
// src/commands/sessions/daemon/sdk/pipeWorkflowOutput.ts
|
|
5177
|
+
var MAX_LOG_LINE = 300;
|
|
5178
|
+
function pipeWorkflowOutput(child, label, onData) {
|
|
5179
|
+
for (const stream of [child.stdout, child.stderr]) {
|
|
5180
|
+
stream?.setEncoding("utf8");
|
|
5181
|
+
stream?.on("data", (chunk) => {
|
|
5182
|
+
for (const line of chunk.split("\n")) {
|
|
5183
|
+
const trimmed = line.trim();
|
|
5184
|
+
if (trimmed)
|
|
5185
|
+
daemonLog(`${label} workflow: ${trimmed.slice(0, MAX_LOG_LINE)}`);
|
|
5186
|
+
}
|
|
5187
|
+
onData(chunk.replaceAll("\n", "\r\n"));
|
|
5188
|
+
});
|
|
5189
|
+
}
|
|
5190
|
+
}
|
|
5191
|
+
|
|
5192
|
+
// src/commands/sessions/daemon/sdk/startWorkflowChild.ts
|
|
5193
|
+
import { spawn as spawn2 } from "child_process";
|
|
5194
|
+
function startWorkflowChild(args, cwd, sessionId, extraEnv) {
|
|
5195
|
+
const command = resolvePtyCommand(args);
|
|
5196
|
+
const child = spawn2(command.file, command.args, {
|
|
5197
|
+
cwd: cwd ?? process.cwd(),
|
|
5198
|
+
env: sessionChildEnv(process.env, sessionId, {
|
|
5199
|
+
...extraEnv,
|
|
5200
|
+
ASSIST_SDK_SESSION: "1"
|
|
5201
|
+
}),
|
|
5202
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
5203
|
+
detached: process.platform !== "win32",
|
|
5204
|
+
windowsHide: true
|
|
5205
|
+
});
|
|
5206
|
+
daemonLog(
|
|
5207
|
+
`session ${sessionId ?? "?"} sdk workflow spawned without a terminal: pid ${child.pid ?? "none"} ${args.join(" ")}`
|
|
5208
|
+
);
|
|
5209
|
+
return child;
|
|
5210
|
+
}
|
|
5211
|
+
|
|
5212
|
+
// src/commands/sessions/daemon/sdk/trackWorkflowExit.ts
|
|
5213
|
+
function trackWorkflowExit(child, label, onExit) {
|
|
5214
|
+
const listeners = [];
|
|
5215
|
+
let exited = false;
|
|
5216
|
+
const finish = (exitCode) => {
|
|
5217
|
+
if (exited) return;
|
|
5218
|
+
exited = true;
|
|
5219
|
+
onExit();
|
|
5220
|
+
for (const listener of listeners) listener({ exitCode });
|
|
5221
|
+
};
|
|
5222
|
+
child.on("error", (error) => {
|
|
5223
|
+
daemonLog(`${label} sdk workflow failed to start: ${error.message}`);
|
|
5224
|
+
finish(1);
|
|
5225
|
+
});
|
|
5226
|
+
child.on("exit", (code, signal) => {
|
|
5227
|
+
daemonLog(`${label} sdk workflow exited: code ${code} signal ${signal}`);
|
|
5228
|
+
finish(code ?? (signal ? 1 : 0));
|
|
5229
|
+
});
|
|
5230
|
+
return (listener) => {
|
|
5231
|
+
listeners.push(listener);
|
|
5232
|
+
return noopDisposable;
|
|
5233
|
+
};
|
|
5234
|
+
}
|
|
5235
|
+
|
|
5236
|
+
// src/commands/sessions/daemon/sdk/spawnSdkWorkflow.ts
|
|
5237
|
+
function spawnSdkWorkflow(args, cwd, sessionId, extraEnv) {
|
|
5238
|
+
refuseMissingCwd(cwd, sessionId);
|
|
5239
|
+
const label = `session ${sessionId ?? "?"}`;
|
|
5240
|
+
const child = startWorkflowChild(args, cwd, sessionId, extraEnv);
|
|
5241
|
+
const relay = createSdkRelay(label);
|
|
5242
|
+
const dataListeners = [];
|
|
5243
|
+
pipeWorkflowOutput(child, label, (data) => {
|
|
5244
|
+
for (const listener of dataListeners) listener(data);
|
|
5245
|
+
});
|
|
5246
|
+
return {
|
|
5247
|
+
get pid() {
|
|
5248
|
+
return child.pid ?? 0;
|
|
5249
|
+
},
|
|
5250
|
+
...sdkTerminalStub(label),
|
|
5251
|
+
onData: (listener) => {
|
|
5252
|
+
dataListeners.push(listener);
|
|
5253
|
+
return noopDisposable;
|
|
5254
|
+
},
|
|
5255
|
+
onExit: trackWorkflowExit(child, label, () => relay.current()?.kill()),
|
|
5256
|
+
kill: () => {
|
|
5257
|
+
daemonLog(
|
|
5258
|
+
`${label} sdk workflow ended by kill (pid ${child.pid ?? "none"})`
|
|
5259
|
+
);
|
|
5260
|
+
relay.current()?.kill();
|
|
5261
|
+
killSdkChild(child);
|
|
5262
|
+
},
|
|
5263
|
+
sdk: relay.handle
|
|
5264
|
+
};
|
|
5265
|
+
}
|
|
5266
|
+
|
|
5267
|
+
// src/commands/sessions/daemon/spawnAssistProcess.ts
|
|
5268
|
+
function spawnAssistProcess(args, cwd, sessionId, extraEnv) {
|
|
5269
|
+
if (assistArgsHarness(args.slice(1), cwd) === "claude-sdk")
|
|
5270
|
+
return spawnSdkWorkflow(args, cwd, sessionId, extraEnv);
|
|
5271
|
+
return spawnPty(args, cwd, sessionId, extraEnv);
|
|
5272
|
+
}
|
|
5273
|
+
|
|
5099
5274
|
// src/commands/sessions/daemon/respawnPlan.ts
|
|
5100
5275
|
function respawnPlan(session, fresh = false) {
|
|
5101
5276
|
const { commandType, cwd, assistArgs } = session;
|
|
@@ -5110,7 +5285,7 @@ function respawnPlan(session, fresh = false) {
|
|
|
5110
5285
|
session.harnessSessionId = void 0;
|
|
5111
5286
|
}
|
|
5112
5287
|
resume = fresh ? void 0 : conversationResumeOutcome(session);
|
|
5113
|
-
return
|
|
5288
|
+
return spawnAssistProcess(
|
|
5114
5289
|
assistResumeArgs({ assistArgs, resumeSessionId: resume?.id }),
|
|
5115
5290
|
cwd,
|
|
5116
5291
|
session.id,
|
|
@@ -5508,7 +5683,7 @@ function createAssistSession(id, assistArgs, cwd, meta, holdPty) {
|
|
|
5508
5683
|
runningSince: startedAt,
|
|
5509
5684
|
waitingSince: null,
|
|
5510
5685
|
...startOrHoldPty(
|
|
5511
|
-
() =>
|
|
5686
|
+
() => spawnAssistProcess(["assist", ...assistArgs], cwd, id),
|
|
5512
5687
|
holdPty
|
|
5513
5688
|
),
|
|
5514
5689
|
scrollback: "",
|
|
@@ -5658,7 +5833,7 @@ function relaunchWrapperSession(id, persisted, base, status) {
|
|
|
5658
5833
|
daemonLog(
|
|
5659
5834
|
`session ${id} relaunching wrapper (${resumeSessionId ? `resume ${resumeSessionId}` : `fresh: ${resume.reason}`})`
|
|
5660
5835
|
);
|
|
5661
|
-
const pty =
|
|
5836
|
+
const pty = spawnAssistProcess(
|
|
5662
5837
|
assistResumeArgs({ assistArgs: persisted.assistArgs, resumeSessionId }),
|
|
5663
5838
|
persisted.cwd,
|
|
5664
5839
|
id,
|
|
@@ -6233,10 +6408,10 @@ function restoreAllSessions(spawner, deps) {
|
|
|
6233
6408
|
|
|
6234
6409
|
// src/commands/sessions/daemon/retrySession.ts
|
|
6235
6410
|
function retrySession(session, clients, onStatusChange) {
|
|
6236
|
-
const
|
|
6237
|
-
if (!
|
|
6411
|
+
const spawn3 = respawnThunk(session);
|
|
6412
|
+
if (!spawn3) return false;
|
|
6238
6413
|
const respawn = () => {
|
|
6239
|
-
respawnSession(session,
|
|
6414
|
+
respawnSession(session, spawn3, "running", clients, onStatusChange);
|
|
6240
6415
|
daemonLog(`session ${session.id} retried: ${session.name}`);
|
|
6241
6416
|
};
|
|
6242
6417
|
const pty = session.pty;
|
|
@@ -6257,7 +6432,7 @@ function respawnThunk(session) {
|
|
|
6257
6432
|
if (session.commandType === "run" && runName)
|
|
6258
6433
|
return () => spawnRun({ name: runName, args: runArgs, cwd });
|
|
6259
6434
|
if (session.commandType === "assist" && assistArgs)
|
|
6260
|
-
return () =>
|
|
6435
|
+
return () => spawnAssistProcess(["assist", ...assistArgs], cwd, session.id);
|
|
6261
6436
|
return null;
|
|
6262
6437
|
}
|
|
6263
6438
|
|
|
@@ -6421,6 +6596,14 @@ var VerifyTracker = class {
|
|
|
6421
6596
|
}
|
|
6422
6597
|
};
|
|
6423
6598
|
|
|
6599
|
+
// src/commands/sessions/shared/compareByLastActivity.ts
|
|
6600
|
+
function activityTime(session) {
|
|
6601
|
+
return new Date(session.lastActivity ?? session.timestamp).getTime();
|
|
6602
|
+
}
|
|
6603
|
+
function compareByLastActivity(a, b) {
|
|
6604
|
+
return activityTime(b) - activityTime(a);
|
|
6605
|
+
}
|
|
6606
|
+
|
|
6424
6607
|
// src/commands/sessions/shared/codex/discoverCodexHistoryEntries.ts
|
|
6425
6608
|
async function discoverCodexHistoryEntries() {
|
|
6426
6609
|
const paths = await discoverCodexRolloutPaths();
|
|
@@ -6449,9 +6632,7 @@ async function discoverHistoryEntries() {
|
|
|
6449
6632
|
const title = titles[session.sessionId];
|
|
6450
6633
|
if (title) session.title = title;
|
|
6451
6634
|
}
|
|
6452
|
-
entries.sort(
|
|
6453
|
-
(a, b) => new Date(b.session.timestamp).getTime() - new Date(a.session.timestamp).getTime()
|
|
6454
|
-
);
|
|
6635
|
+
entries.sort((a, b) => compareByLastActivity(a.session, b.session));
|
|
6455
6636
|
return entries;
|
|
6456
6637
|
}
|
|
6457
6638
|
|
|
@@ -6486,7 +6667,7 @@ function withRepoGroups(sessions) {
|
|
|
6486
6667
|
// src/commands/sessions/daemon/collectHistory.ts
|
|
6487
6668
|
async function collectHistory(linked) {
|
|
6488
6669
|
const [local, remote] = await Promise.all([discoverSessions(), linked]);
|
|
6489
|
-
return withRepoGroups(local).concat(remote);
|
|
6670
|
+
return withRepoGroups(local).concat(remote).sort(compareByLastActivity);
|
|
6490
6671
|
}
|
|
6491
6672
|
|
|
6492
6673
|
// src/commands/sessions/daemon/pins/PinRelay.ts
|
|
@@ -7917,6 +8098,84 @@ var handleInterrupt = routed((_client, m, d) => {
|
|
|
7917
8098
|
sdk.interrupt();
|
|
7918
8099
|
});
|
|
7919
8100
|
|
|
8101
|
+
// src/commands/sessions/daemon/sdk/linkWorkflowQuery.ts
|
|
8102
|
+
function linkWorkflowQuery(client, sessionId, query) {
|
|
8103
|
+
let ended = false;
|
|
8104
|
+
query.onExit(({ exitCode }) => {
|
|
8105
|
+
ended = true;
|
|
8106
|
+
daemonLog(
|
|
8107
|
+
`session ${sessionId} sdk workflow query ended: exit ${exitCode}`
|
|
8108
|
+
);
|
|
8109
|
+
sendTo(client, { type: "sdk-exit", sessionId, exitCode });
|
|
8110
|
+
});
|
|
8111
|
+
client.onClose?.(() => {
|
|
8112
|
+
if (ended) return;
|
|
8113
|
+
daemonLog(
|
|
8114
|
+
`session ${sessionId} sdk workflow launcher disconnected: ending its query`
|
|
8115
|
+
);
|
|
8116
|
+
query.kill();
|
|
8117
|
+
});
|
|
8118
|
+
}
|
|
8119
|
+
|
|
8120
|
+
// src/commands/sessions/daemon/sdk/refuseSdkLaunch.ts
|
|
8121
|
+
function refuseSdkLaunch(client, sessionId, reason6) {
|
|
8122
|
+
daemonLog(`sdk-launch refused: session ${sessionId} ${reason6}`);
|
|
8123
|
+
sendTo(client, {
|
|
8124
|
+
type: "sdk-exit",
|
|
8125
|
+
sessionId,
|
|
8126
|
+
exitCode: 1,
|
|
8127
|
+
error: `Claude (SDK) launch refused: session ${sessionId} ${reason6}`
|
|
8128
|
+
});
|
|
8129
|
+
}
|
|
8130
|
+
|
|
8131
|
+
// src/commands/sessions/daemon/sdk/handleSdkLaunch.ts
|
|
8132
|
+
var optional = (value) => typeof value === "string" && value ? value : void 0;
|
|
8133
|
+
var stringRecord = (value) => Object.fromEntries(
|
|
8134
|
+
Object.entries(value && typeof value === "object" ? value : {}).filter(
|
|
8135
|
+
(entry) => typeof entry[1] === "string"
|
|
8136
|
+
)
|
|
8137
|
+
);
|
|
8138
|
+
var handleSdkLaunch = (client, m, d) => {
|
|
8139
|
+
const sessionId = String(d.sessionId);
|
|
8140
|
+
m.clients.delete(client);
|
|
8141
|
+
const session = m.session(sessionId);
|
|
8142
|
+
const attach = session?.pty?.sdk?.attach;
|
|
8143
|
+
if (!attach) {
|
|
8144
|
+
refuseSdkLaunch(
|
|
8145
|
+
client,
|
|
8146
|
+
sessionId,
|
|
8147
|
+
session ? "is not a Claude (SDK) workflow session" : "was not found"
|
|
8148
|
+
);
|
|
8149
|
+
return;
|
|
8150
|
+
}
|
|
8151
|
+
const prompt = optional(d.prompt);
|
|
8152
|
+
const resumeId = optional(d.resumeId);
|
|
8153
|
+
daemonLog(
|
|
8154
|
+
`session ${sessionId} sdk-launch received: ${resumeId ? `resume ${resumeId}` : `claude session ${optional(d.conversationId) ?? "unassigned"}`}${prompt ? "" : ", no prompt"}`
|
|
8155
|
+
);
|
|
8156
|
+
let query;
|
|
8157
|
+
try {
|
|
8158
|
+
query = spawnClaudeSdk({
|
|
8159
|
+
prompt,
|
|
8160
|
+
cwd: optional(d.cwd),
|
|
8161
|
+
sessionId,
|
|
8162
|
+
claudeSessionId: optional(d.conversationId),
|
|
8163
|
+
resumeId,
|
|
8164
|
+
model: optional(d.model),
|
|
8165
|
+
launcherEnv: stringRecord(d.env)
|
|
8166
|
+
});
|
|
8167
|
+
} catch (error) {
|
|
8168
|
+
refuseSdkLaunch(
|
|
8169
|
+
client,
|
|
8170
|
+
sessionId,
|
|
8171
|
+
error instanceof Error ? error.message : String(error)
|
|
8172
|
+
);
|
|
8173
|
+
return;
|
|
8174
|
+
}
|
|
8175
|
+
attach(query, !prompt);
|
|
8176
|
+
linkWorkflowQuery(client, sessionId, query);
|
|
8177
|
+
};
|
|
8178
|
+
|
|
7920
8179
|
// src/commands/sessions/daemon/handleWebLog.ts
|
|
7921
8180
|
var handleWebLog = (client, _m, d) => {
|
|
7922
8181
|
daemonLog(`web: ${String(d.message)}`);
|
|
@@ -8057,7 +8316,7 @@ async function handleSearchHistory(client, data) {
|
|
|
8057
8316
|
}
|
|
8058
8317
|
|
|
8059
8318
|
// src/commands/sessions/daemon/creator.ts
|
|
8060
|
-
function creator(isNew,
|
|
8319
|
+
function creator(isNew, spawn3) {
|
|
8061
8320
|
const reply = (client, d, result) => {
|
|
8062
8321
|
const traceId = typeof d.traceId === "string" ? d.traceId : void 0;
|
|
8063
8322
|
if (typeof result !== "string") {
|
|
@@ -8075,7 +8334,7 @@ function creator(isNew, spawn2) {
|
|
|
8075
8334
|
if (m.links.route(client, d)) return;
|
|
8076
8335
|
let result;
|
|
8077
8336
|
try {
|
|
8078
|
-
result =
|
|
8337
|
+
result = spawn3(m, d);
|
|
8079
8338
|
} catch (error) {
|
|
8080
8339
|
fail(client, d, error);
|
|
8081
8340
|
return;
|
|
@@ -8956,14 +9215,14 @@ function spawnAssistCreate(m, d) {
|
|
|
8956
9215
|
},
|
|
8957
9216
|
spawnContextFrom(d)
|
|
8958
9217
|
);
|
|
8959
|
-
const
|
|
9218
|
+
const spawn3 = (holder) => m.spawnAssist(
|
|
8960
9219
|
assistArgs,
|
|
8961
9220
|
holder ?? cwd,
|
|
8962
9221
|
{ ...meta, inPlace: inPlace || holder !== void 0 },
|
|
8963
9222
|
spawnContextFrom(d)
|
|
8964
9223
|
);
|
|
8965
|
-
if (inPlace || !isPrCheckoutArgs(assistArgs)) return
|
|
8966
|
-
return prCheckoutHolder(assistArgs, cwd).then(
|
|
9224
|
+
if (inPlace || !isPrCheckoutArgs(assistArgs)) return spawn3();
|
|
9225
|
+
return prCheckoutHolder(assistArgs, cwd).then(spawn3);
|
|
8967
9226
|
}
|
|
8968
9227
|
|
|
8969
9228
|
// src/commands/sessions/daemon/sessionBlocker.ts
|
|
@@ -9076,6 +9335,7 @@ var messageHandlers = {
|
|
|
9076
9335
|
...viewerHandlers,
|
|
9077
9336
|
...pinHandlers,
|
|
9078
9337
|
"type-prompt": handleTypePrompt,
|
|
9338
|
+
"sdk-launch": handleSdkLaunch,
|
|
9079
9339
|
"type-prompt-to-writer": handleTypePromptToWriter,
|
|
9080
9340
|
...retryHandlers,
|
|
9081
9341
|
dismiss: handleDismiss,
|
|
@@ -9119,7 +9379,8 @@ function handleConnection(socket, manager) {
|
|
|
9119
9379
|
send: (data) => {
|
|
9120
9380
|
if (socket.writable) socket.write(`${data}
|
|
9121
9381
|
`);
|
|
9122
|
-
}
|
|
9382
|
+
},
|
|
9383
|
+
onClose: (listener) => socket.on("close", listener)
|
|
9123
9384
|
};
|
|
9124
9385
|
manager.addClient(client);
|
|
9125
9386
|
manager.clients.greet(client);
|
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
import {
|
|
2
2
|
resolveHarness
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-FDWIKBS3.js";
|
|
4
4
|
import {
|
|
5
5
|
refine
|
|
6
|
-
} from "./chunk-
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
6
|
+
} from "./chunk-WMNOK5D7.js";
|
|
7
|
+
import "./chunk-64LIWSXE.js";
|
|
8
|
+
import "./chunk-67B7TFAR.js";
|
|
9
9
|
import "./chunk-SB4BG7PH.js";
|
|
10
10
|
import "./chunk-B3JSQA5D.js";
|
|
11
|
-
import "./chunk-
|
|
12
|
-
import "./chunk-
|
|
11
|
+
import "./chunk-QRAZBFDX.js";
|
|
12
|
+
import "./chunk-R5JL5IV5.js";
|
|
13
13
|
import "./chunk-LFRSZIAS.js";
|
|
14
14
|
import "./chunk-5PKWV3WT.js";
|
|
15
15
|
import "./chunk-ZYK7V4PG.js";
|
|
16
16
|
import "./chunk-PYACTCZ2.js";
|
|
17
17
|
import "./chunk-4YAIQN3S.js";
|
|
18
18
|
import "./chunk-NWNODYLQ.js";
|
|
19
|
-
import "./chunk-
|
|
20
|
-
import "./chunk-
|
|
19
|
+
import "./chunk-G4KTQ3BM.js";
|
|
20
|
+
import "./chunk-MYBNV4GH.js";
|
|
21
21
|
import "./chunk-OZNYQOQK.js";
|
|
22
22
|
import "./chunk-UJAMN3ML.js";
|
|
23
|
-
import "./chunk-
|
|
23
|
+
import "./chunk-SMOEJN6Q.js";
|
|
24
24
|
import "./chunk-ORSRBZ2X.js";
|
|
25
25
|
import "./chunk-PCF66ALO.js";
|
|
26
26
|
import "./chunk-UYD7R4HL.js";
|
|
@@ -33,10 +33,10 @@ import "./chunk-QAJUCN3A.js";
|
|
|
33
33
|
import "./chunk-NOHNPOQK.js";
|
|
34
34
|
import "./chunk-DISNKALJ.js";
|
|
35
35
|
import "./chunk-BJDGVLYX.js";
|
|
36
|
-
import "./chunk-
|
|
37
|
-
import "./chunk-
|
|
38
|
-
import "./chunk-
|
|
39
|
-
import "./chunk-
|
|
36
|
+
import "./chunk-6ETLOAOY.js";
|
|
37
|
+
import "./chunk-P56ZEVAK.js";
|
|
38
|
+
import "./chunk-KMO2Y4KT.js";
|
|
39
|
+
import "./chunk-3DR7FGAL.js";
|
|
40
40
|
import "./chunk-X6ETCS7E.js";
|
|
41
41
|
import "./chunk-U732RAGX.js";
|
|
42
42
|
import "./chunk-TCTX3UXU.js";
|
|
@@ -48,12 +48,12 @@ import "./chunk-3QKE2ONF.js";
|
|
|
48
48
|
import "./chunk-O5JIFWMQ.js";
|
|
49
49
|
import "./chunk-LMUTL44M.js";
|
|
50
50
|
import "./chunk-6NDXAN45.js";
|
|
51
|
-
import "./chunk-
|
|
51
|
+
import "./chunk-75CTEDPY.js";
|
|
52
52
|
import "./chunk-MELBVXKL.js";
|
|
53
53
|
import "./chunk-OGJ6AZK4.js";
|
|
54
|
-
import "./chunk-
|
|
54
|
+
import "./chunk-B5IBWXPS.js";
|
|
55
55
|
import "./chunk-MRUIXQXS.js";
|
|
56
|
-
import "./chunk-
|
|
56
|
+
import "./chunk-HO7RNI6V.js";
|
|
57
57
|
import "./chunk-DIAC4XYA.js";
|
|
58
58
|
import "./chunk-UU77KEL6.js";
|
|
59
59
|
import "./chunk-W7TRZLEM.js";
|
|
@@ -2,7 +2,7 @@ import {
|
|
|
2
2
|
formatScanUsage,
|
|
3
3
|
inboxScanBlocker,
|
|
4
4
|
runInboxScan
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-4VYZIWCE.js";
|
|
6
6
|
import "./chunk-2JYMVJGZ.js";
|
|
7
7
|
import "./chunk-NWNODYLQ.js";
|
|
8
8
|
import {
|
|
@@ -20,9 +20,9 @@ import "./chunk-MELBVXKL.js";
|
|
|
20
20
|
import "./chunk-OGJ6AZK4.js";
|
|
21
21
|
import {
|
|
22
22
|
harnessAdapter
|
|
23
|
-
} from "./chunk-
|
|
23
|
+
} from "./chunk-B5IBWXPS.js";
|
|
24
24
|
import "./chunk-MRUIXQXS.js";
|
|
25
|
-
import "./chunk-
|
|
25
|
+
import "./chunk-HO7RNI6V.js";
|
|
26
26
|
import "./chunk-DIAC4XYA.js";
|
|
27
27
|
import "./chunk-UU77KEL6.js";
|
|
28
28
|
import "./chunk-W7TRZLEM.js";
|
|
@@ -44,6 +44,7 @@ import "./chunk-YXXKT6LL.js";
|
|
|
44
44
|
import "./chunk-USKD27FY.js";
|
|
45
45
|
import "./chunk-HN7MFXZ7.js";
|
|
46
46
|
import "./chunk-DZGYHAE7.js";
|
|
47
|
+
import "./chunk-UGGH3MEX.js";
|
|
47
48
|
import "./chunk-IEK6CQQH.js";
|
|
48
49
|
import "./chunk-6DGPQ67E.js";
|
|
49
50
|
import "./chunk-SSKHLBQB.js";
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
currentExecutionIdentity,
|
|
16
16
|
getSchemaSessionApprovalDir,
|
|
17
17
|
getSchemaSessionApprovalPath
|
|
18
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-56PNBMBF.js";
|
|
19
19
|
import "./chunk-ZMH7UZNP.js";
|
|
20
20
|
import {
|
|
21
21
|
recordGitRef
|
|
@@ -31,9 +31,9 @@ import "./chunk-3QKE2ONF.js";
|
|
|
31
31
|
import "./chunk-O5JIFWMQ.js";
|
|
32
32
|
import "./chunk-LMUTL44M.js";
|
|
33
33
|
import "./chunk-6NDXAN45.js";
|
|
34
|
-
import "./chunk-
|
|
34
|
+
import "./chunk-B5IBWXPS.js";
|
|
35
35
|
import "./chunk-MRUIXQXS.js";
|
|
36
|
-
import "./chunk-
|
|
36
|
+
import "./chunk-HO7RNI6V.js";
|
|
37
37
|
import "./chunk-DIAC4XYA.js";
|
|
38
38
|
import "./chunk-UU77KEL6.js";
|
|
39
39
|
import "./chunk-W7TRZLEM.js";
|
|
@@ -58,6 +58,7 @@ import "./chunk-YXXKT6LL.js";
|
|
|
58
58
|
import "./chunk-USKD27FY.js";
|
|
59
59
|
import "./chunk-HN7MFXZ7.js";
|
|
60
60
|
import "./chunk-DZGYHAE7.js";
|
|
61
|
+
import "./chunk-UGGH3MEX.js";
|
|
61
62
|
import "./chunk-IEK6CQQH.js";
|
|
62
63
|
import "./chunk-6DGPQ67E.js";
|
|
63
64
|
import "./chunk-SSKHLBQB.js";
|
|
@@ -11,7 +11,7 @@ import "./chunk-JVG5AJA2.js";
|
|
|
11
11
|
import {
|
|
12
12
|
currentExecutionIdentity,
|
|
13
13
|
getSchemaSessionApprovalPath
|
|
14
|
-
} from "./chunk-
|
|
14
|
+
} from "./chunk-56PNBMBF.js";
|
|
15
15
|
import "./chunk-ZMH7UZNP.js";
|
|
16
16
|
import "./chunk-FPWL4VRC.js";
|
|
17
17
|
import "./chunk-E36L7ASL.js";
|
|
@@ -30,9 +30,9 @@ import "./chunk-3QKE2ONF.js";
|
|
|
30
30
|
import "./chunk-O5JIFWMQ.js";
|
|
31
31
|
import "./chunk-LMUTL44M.js";
|
|
32
32
|
import "./chunk-6NDXAN45.js";
|
|
33
|
-
import "./chunk-
|
|
33
|
+
import "./chunk-B5IBWXPS.js";
|
|
34
34
|
import "./chunk-MRUIXQXS.js";
|
|
35
|
-
import "./chunk-
|
|
35
|
+
import "./chunk-HO7RNI6V.js";
|
|
36
36
|
import "./chunk-DIAC4XYA.js";
|
|
37
37
|
import "./chunk-UU77KEL6.js";
|
|
38
38
|
import "./chunk-W7TRZLEM.js";
|