@staff0rd/assist 0.1134.0 → 0.1135.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/index.js CHANGED
@@ -6,7 +6,7 @@ import { Command } from "commander";
6
6
  // package.json
7
7
  var package_default = {
8
8
  name: "@staff0rd/assist",
9
- version: "0.1134.0",
9
+ version: "0.1135.0",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -6206,6 +6206,8 @@ function userEvents(entry, at2) {
6206
6206
  const events = [];
6207
6207
  const text18 = renderUserPrompt(entry, Number.POSITIVE_INFINITY);
6208
6208
  if (text18) events.push({ kind: "message", role: "user", text: text18, at: at2 });
6209
+ else if (normalizeUser(entry).kind === "interrupt")
6210
+ events.push({ kind: "interrupt", at: at2 });
6209
6211
  for (const block of claudeContentBlocksOf(contentOf(entry))) {
6210
6212
  if (block.type !== "tool_result" || block.is_error) continue;
6211
6213
  const body = resultText(block.content).trim();
@@ -7346,28 +7348,6 @@ var claudeAdapter = {
7346
7348
  activityIdentity: (conversationId) => ({ claudeSessionId: conversationId })
7347
7349
  };
7348
7350
 
7349
- // src/commands/sessions/daemon/spawnClaudeSdk.ts
7350
- import { query } from "@anthropic-ai/claude-agent-sdk";
7351
-
7352
- // src/commands/sessions/daemon/resolveClaudeExecutable.ts
7353
- import { execFileSync as execFileSync2 } from "child_process";
7354
- var opts = {
7355
- encoding: "utf8",
7356
- stdio: ["ignore", "pipe", "ignore"],
7357
- windowsHide: true
7358
- };
7359
- function resolveClaudeExecutable() {
7360
- const found = process.platform === "win32" ? execFileSync2("where", ["claude"], opts) : execFileSync2(
7361
- process.env.SHELL ?? "bash",
7362
- ["-l", "-c", "command -v claude"],
7363
- opts
7364
- );
7365
- const lines = found.split(/\r?\n/).map((line) => line.trim()).filter((line) => /^(\/|[A-Za-z]:\\)/.test(line));
7366
- const path128 = lines.find((line) => line.endsWith(".exe")) ?? lines.at(-1);
7367
- if (!path128) throw new Error("claude is not on PATH");
7368
- return path128;
7369
- }
7370
-
7371
7351
  // src/commands/sessions/daemon/sdk/createSdkInput.ts
7372
7352
  function userMessage(text18) {
7373
7353
  return {
@@ -7435,10 +7415,31 @@ function sdkTerminalStub(label) {
7435
7415
  };
7436
7416
  }
7437
7417
 
7418
+ // src/commands/sessions/daemon/sdk/sdkSessionHandle.ts
7419
+ function sdkSessionHandle(label) {
7420
+ const listeners = [];
7421
+ let turn;
7422
+ const unbound = (action) => daemonLog(`${label} sdk ${action} dropped: query not started`);
7423
+ const handle = {
7424
+ onEvent: (listener) => listeners.push(listener),
7425
+ send: (text18) => turn ? turn.send(text18) : unbound("message"),
7426
+ interrupt: () => turn ? turn.interrupt() : unbound("interrupt")
7427
+ };
7428
+ return {
7429
+ handle,
7430
+ emit: (event) => {
7431
+ for (const listener of listeners) listener(event);
7432
+ },
7433
+ bind: (controls) => {
7434
+ turn = controls;
7435
+ }
7436
+ };
7437
+ }
7438
+
7438
7439
  // src/commands/sessions/daemon/sdk/createSdkSessionProcess.ts
7439
7440
  function createSdkSessionProcess(sessionId2, abort2) {
7440
7441
  const label = `session ${sessionId2 ?? "?"}`;
7441
- const eventListeners = [];
7442
+ const sdk = sdkSessionHandle(label);
7442
7443
  const exitListeners = [];
7443
7444
  let child2;
7444
7445
  let exited = false;
@@ -7458,13 +7459,11 @@ function createSdkSessionProcess(sessionId2, abort2) {
7458
7459
  exitListeners.push(listener);
7459
7460
  return noopDisposable;
7460
7461
  },
7461
- sdk: { onEvent: (listener) => eventListeners.push(listener) }
7462
+ sdk: sdk.handle
7462
7463
  };
7463
7464
  return {
7464
7465
  process: sessionProcess,
7465
- emit: (event) => {
7466
- for (const listener of eventListeners) listener(event);
7467
- },
7466
+ emit: sdk.emit,
7468
7467
  exit: (exitCode) => {
7469
7468
  if (exited) return;
7470
7469
  exited = true;
@@ -7474,27 +7473,149 @@ function createSdkSessionProcess(sessionId2, abort2) {
7474
7473
  attach: (spawned) => {
7475
7474
  child2 = spawned;
7476
7475
  },
7477
- aborted: () => abort2.signal.aborted
7476
+ aborted: () => abort2.signal.aborted,
7477
+ bind: sdk.bind
7478
7478
  };
7479
7479
  }
7480
7480
 
7481
- // src/commands/sessions/daemon/sdk/createSdkTurnTracker.ts
7482
- function createSdkTurnTracker(label, control) {
7481
+ // src/commands/sessions/daemon/sdk/createSdkInterrupt.ts
7482
+ function createSdkInterrupt(label, setInterrupting) {
7483
+ let interrupting = false;
7484
+ const set = (pending) => {
7485
+ if (pending === interrupting) return;
7486
+ interrupting = pending;
7487
+ setInterrupting(pending);
7488
+ };
7489
+ return {
7490
+ clear: () => set(false),
7491
+ request: (busy, request) => {
7492
+ if (!busy || interrupting) {
7493
+ daemonLog(
7494
+ `${label} sdk interrupt ignored: ${interrupting ? "already interrupting" : "no turn running"}`
7495
+ );
7496
+ return;
7497
+ }
7498
+ daemonLog(`${label} sdk interrupt requested`);
7499
+ set(true);
7500
+ request().then(
7501
+ () => daemonLog(`${label} sdk interrupt accepted`),
7502
+ (error) => {
7503
+ daemonLog(
7504
+ `${label} sdk interrupt failed: ${error instanceof Error ? error.message : String(error)}`
7505
+ );
7506
+ set(false);
7507
+ }
7508
+ );
7509
+ }
7510
+ };
7511
+ }
7512
+
7513
+ // src/commands/sessions/daemon/sdk/createSdkMessageQueue.ts
7514
+ var MAX_LOGGED = 200;
7515
+ function quoteForLog(text18) {
7516
+ return JSON.stringify(
7517
+ text18.length > MAX_LOGGED ? `${text18.slice(0, MAX_LOGGED)}\u2026` : text18
7518
+ );
7519
+ }
7520
+ function createSdkMessageQueue(label, control, push2) {
7521
+ let queued = [];
7522
+ const publish = (next3) => {
7523
+ queued = next3;
7524
+ control.emit({ kind: "queued", texts: next3 });
7525
+ };
7526
+ return {
7527
+ add: (text18) => {
7528
+ publish([...queued, text18]);
7529
+ daemonLog(
7530
+ `${label} sdk message queued behind running turn (${queued.length} queued): ${quoteForLog(text18)}`
7531
+ );
7532
+ },
7533
+ flush: () => {
7534
+ if (!queued.length) return false;
7535
+ daemonLog(`${label} sdk sending ${queued.length} queued message(s)`);
7536
+ const text18 = queued.join("\n\n");
7537
+ publish([]);
7538
+ push2(text18);
7539
+ return true;
7540
+ }
7541
+ };
7542
+ }
7543
+
7544
+ // src/commands/sessions/daemon/sdk/createSdkTurnEmitter.ts
7545
+ function createSdkTurnEmitter(label, control) {
7483
7546
  let status2;
7484
7547
  let activity2 = null;
7485
- const setActivity = (next3) => {
7486
- if (next3 === activity2) return;
7487
- activity2 = next3;
7488
- control.emit({ kind: "activity", text: next3 });
7548
+ return {
7549
+ activity: (next3) => {
7550
+ if (next3 === activity2) return;
7551
+ activity2 = next3;
7552
+ control.emit({ kind: "activity", text: next3 });
7553
+ },
7554
+ status: (next3) => {
7555
+ if (next3 === status2) return;
7556
+ status2 = next3;
7557
+ daemonLog(`${label} sdk status: ${next3}`);
7558
+ control.emit({ kind: "status", status: next3 });
7559
+ }
7489
7560
  };
7561
+ }
7562
+
7563
+ // src/commands/sessions/daemon/sdk/createSdkTurnTracker.ts
7564
+ function createSdkTurnTracker(label, control, push2) {
7565
+ let busy = false;
7566
+ const emit3 = createSdkTurnEmitter(label, control);
7567
+ const queue = createSdkMessageQueue(label, control, push2);
7568
+ const interrupt = createSdkInterrupt(
7569
+ label,
7570
+ (pending) => control.emit({ kind: "interrupting", pending })
7571
+ );
7490
7572
  const setStatus3 = (next3) => {
7491
- if (next3 === "waiting") setActivity(null);
7492
- if (next3 === status2) return;
7493
- status2 = next3;
7494
- daemonLog(`${label} sdk status: ${next3}`);
7495
- control.emit({ kind: "status", status: next3 });
7573
+ busy = next3 === "running";
7574
+ if (next3 === "waiting") {
7575
+ emit3.activity(null);
7576
+ interrupt.clear();
7577
+ busy = queue.flush();
7578
+ if (busy) return;
7579
+ }
7580
+ emit3.status(next3);
7496
7581
  };
7497
- return { setActivity, setStatus: setStatus3 };
7582
+ return {
7583
+ setActivity: emit3.activity,
7584
+ setStatus: setStatus3,
7585
+ start: (prompt) => {
7586
+ busy = true;
7587
+ push2(prompt);
7588
+ },
7589
+ send: (text18) => {
7590
+ if (busy) return queue.add(text18);
7591
+ daemonLog(`${label} sdk message sent: ${quoteForLog(text18)}`);
7592
+ push2(text18);
7593
+ setStatus3("running");
7594
+ },
7595
+ interrupt: (request) => interrupt.request(busy, request)
7596
+ };
7597
+ }
7598
+
7599
+ // src/commands/sessions/daemon/sdk/startSdkQuery.ts
7600
+ import { query } from "@anthropic-ai/claude-agent-sdk";
7601
+
7602
+ // src/commands/sessions/daemon/resolveClaudeExecutable.ts
7603
+ import { execFileSync as execFileSync2 } from "child_process";
7604
+ var opts = {
7605
+ encoding: "utf8",
7606
+ stdio: ["ignore", "pipe", "ignore"],
7607
+ windowsHide: true
7608
+ };
7609
+ function resolveClaudeExecutable() {
7610
+ const found = process.platform === "win32" ? execFileSync2("where", ["claude"], opts) : execFileSync2(
7611
+ process.env.SHELL ?? "bash",
7612
+ ["-l", "-c", "command -v claude"],
7613
+ opts
7614
+ );
7615
+ const lines = found.split(/\r?\n/).map((line) => line.trim()).filter((line) => /^(\/|[A-Za-z]:\\)/.test(line));
7616
+ const path128 = lines.find((line) => line.endsWith(".exe")) ?? lines.at(-1);
7617
+ if (!path128) throw new Error("claude is not on PATH");
7618
+ return path128;
7498
7619
  }
7499
7620
 
7500
7621
  // src/commands/sessions/daemon/sdk/logSdkMessage.ts
@@ -7546,9 +7667,8 @@ function sdkTurnStatus(message4) {
7546
7667
  }
7547
7668
 
7548
7669
  // src/commands/sessions/daemon/sdk/runSdkQuery.ts
7549
- async function runSdkQuery(messages2, sessionId2, control) {
7670
+ async function runSdkQuery(messages2, sessionId2, control, turn) {
7550
7671
  const label = `session ${sessionId2 ?? "?"}`;
7551
- const turn = createSdkTurnTracker(label, control);
7552
7672
  try {
7553
7673
  for await (const message4 of messages2) {
7554
7674
  logSdkMessage(label, message4);
@@ -7625,18 +7745,8 @@ function sdkQueryOptions(opts2, executable, abort2, control) {
7625
7745
  };
7626
7746
  }
7627
7747
 
7628
- // src/commands/sessions/daemon/spawnClaudeSdk.ts
7629
- function spawnClaudeSdk(opts2) {
7630
- refuseMissingCwd(opts2.cwd, opts2.sessionId);
7631
- const abort2 = new AbortController();
7632
- const control = createSdkSessionProcess(opts2.sessionId, abort2);
7633
- const input = createSdkInput();
7634
- if (opts2.prompt) input.push(opts2.prompt);
7635
- abort2.signal.addEventListener("abort", input.close);
7636
- void startQuery(opts2, abort2, control, input.messages);
7637
- return control.process;
7638
- }
7639
- async function startQuery(opts2, abort2, control, prompt) {
7748
+ // src/commands/sessions/daemon/sdk/startSdkQuery.ts
7749
+ async function startSdkQuery(opts2, abort2, control, turn, prompt) {
7640
7750
  const label = `session ${opts2.sessionId ?? "?"}`;
7641
7751
  try {
7642
7752
  const executable = resolveClaudeExecutable();
@@ -7647,7 +7757,13 @@ async function startQuery(opts2, abort2, control, prompt) {
7647
7757
  prompt,
7648
7758
  options: sdkQueryOptions(opts2, executable, abort2, control)
7649
7759
  });
7650
- await runSdkQuery(messages2, opts2.sessionId, control);
7760
+ control.bind({
7761
+ send: turn.send,
7762
+ interrupt: () => turn.interrupt(async () => {
7763
+ await messages2.interrupt();
7764
+ })
7765
+ });
7766
+ await runSdkQuery(messages2, opts2.sessionId, control, turn);
7651
7767
  } catch (error) {
7652
7768
  daemonLog(
7653
7769
  `${label} sdk query not started: ${error instanceof Error ? error.message : String(error)}`
@@ -7656,6 +7772,23 @@ async function startQuery(opts2, abort2, control, prompt) {
7656
7772
  }
7657
7773
  }
7658
7774
 
7775
+ // src/commands/sessions/daemon/spawnClaudeSdk.ts
7776
+ function spawnClaudeSdk(opts2) {
7777
+ refuseMissingCwd(opts2.cwd, opts2.sessionId);
7778
+ const abort2 = new AbortController();
7779
+ const control = createSdkSessionProcess(opts2.sessionId, abort2);
7780
+ const input = createSdkInput();
7781
+ const turn = createSdkTurnTracker(
7782
+ `session ${opts2.sessionId ?? "?"}`,
7783
+ control,
7784
+ input.push
7785
+ );
7786
+ if (opts2.prompt) turn.start(opts2.prompt);
7787
+ abort2.signal.addEventListener("abort", input.close);
7788
+ void startSdkQuery(opts2, abort2, control, turn, input.messages);
7789
+ return control.process;
7790
+ }
7791
+
7659
7792
  // src/shared/harnessAdapters/claudeSdkAdapter.ts
7660
7793
  var claudeSdkAdapter = {
7661
7794
  ...claudeAdapter,
@@ -23061,6 +23194,7 @@ function transcriptMessages(reader, lines) {
23061
23194
  return [{ role: event.role, text: event.text }];
23062
23195
  if (event.kind === "tool")
23063
23196
  return [{ role: "tool", tool: event.tool, target: event.target }];
23197
+ if (event.kind === "interrupt") return [{ role: "interrupt" }];
23064
23198
  return [];
23065
23199
  });
23066
23200
  }
@@ -56302,11 +56436,15 @@ function toSessionViewInfo({
56302
56436
  activeViewerNode,
56303
56437
  transfer,
56304
56438
  pty: pty2,
56305
- sdkActivity
56439
+ sdkActivity,
56440
+ sdkQueued,
56441
+ sdkInterrupting
56306
56442
  }) {
56307
56443
  return {
56308
56444
  sdk: pty2?.sdk ? true : void 0,
56309
56445
  sdkActivity,
56446
+ sdkQueued,
56447
+ sdkInterrupting,
56310
56448
  transfer,
56311
56449
  lastUserMessage,
56312
56450
  lastAssistantMessage,
@@ -56634,6 +56772,11 @@ var SUBMIT = "\r";
56634
56772
  function bracketedPaste(text18) {
56635
56773
  return `${PASTE_START}${text18.replace(/\r?\n/g, SUBMIT)}${PASTE_END}`;
56636
56774
  }
56775
+ function unwrapBracketedPaste(data) {
56776
+ if (!data.startsWith(PASTE_START) || !data.endsWith(PASTE_END))
56777
+ return void 0;
56778
+ return data.slice(PASTE_START.length, data.length - PASTE_END.length).replaceAll(SUBMIT, "\n");
56779
+ }
56637
56780
 
56638
56781
  // src/commands/sessions/shared/pasteAndSubmit.ts
56639
56782
  var SUBMIT_DELAY_MS = 150;
@@ -56785,11 +56928,26 @@ function watchPromptSubmit(session, data, onStatusChange) {
56785
56928
  watchSubmitOutcome(session, onStatusChange);
56786
56929
  }
56787
56930
 
56931
+ // src/commands/sessions/daemon/writeToSdkSession.ts
56932
+ function writeToSdkSession(session, data) {
56933
+ const text18 = unwrapBracketedPaste(data);
56934
+ if (text18 !== void 0) {
56935
+ daemonLog(`session ${session.id} sdk message received from input`);
56936
+ session.pty?.sdk?.send(text18);
56937
+ return;
56938
+ }
56939
+ if (data === SUBMIT) {
56940
+ daemonLog(`session ${session.id} sdk submit ignored: paste already sent`);
56941
+ return;
56942
+ }
56943
+ skipsTerminalPath(session, "input");
56944
+ }
56945
+
56788
56946
  // src/commands/sessions/daemon/writeToSession.ts
56789
56947
  function writeToSession(sessions, id, data, onStatusChange, viewer = {}) {
56790
56948
  const s = sessions.get(id);
56791
56949
  if (!s || s.status === "done") return;
56792
- if (skipsTerminalPath(s, "input")) return;
56950
+ if (isSdkSession(s)) return writeToSdkSession(s, data);
56793
56951
  const response = isTerminalResponse(data);
56794
56952
  if (dropsInactiveViewerResponse(s, response, viewer)) return;
56795
56953
  s.pty?.write(data);
@@ -59363,14 +59521,25 @@ function handlePtyExit(session, exitCode, onStatusChange) {
59363
59521
  }
59364
59522
 
59365
59523
  // src/commands/sessions/daemon/wireSdkEvents.ts
59524
+ function applyViewEvent(session, event) {
59525
+ if (event.kind === "activity") {
59526
+ session.sdkActivity = event.text ?? void 0;
59527
+ daemonLog(`session ${session.id} sdk activity: ${event.text ?? "cleared"}`);
59528
+ } else if (event.kind === "queued") {
59529
+ session.sdkQueued = event.texts.length ? event.texts : void 0;
59530
+ daemonLog(`session ${session.id} sdk queued: ${event.texts.length}`);
59531
+ } else {
59532
+ session.sdkInterrupting = event.pending || void 0;
59533
+ daemonLog(
59534
+ `session ${session.id} sdk interrupt ${event.pending ? "pending" : "landed"}`
59535
+ );
59536
+ }
59537
+ }
59366
59538
  function wireSdkEvents(session, onStatusChange, notify2) {
59367
59539
  session.pty?.sdk?.onEvent((event) => {
59368
59540
  if (session.status === "done" || session.status === "stopped") return;
59369
- if (event.kind === "activity") {
59370
- session.sdkActivity = event.text ?? void 0;
59371
- daemonLog(
59372
- `session ${session.id} sdk activity: ${event.text ?? "cleared"}`
59373
- );
59541
+ if (event.kind !== "status") {
59542
+ applyViewEvent(session, event);
59374
59543
  notify2?.();
59375
59544
  return;
59376
59545
  }
@@ -59539,7 +59708,7 @@ function isOpeningReference(text18) {
59539
59708
  return !args || isBareReferencePrompt(args);
59540
59709
  }
59541
59710
  function eventText(event) {
59542
- return event.kind === "tool" ? "" : event.text.trim();
59711
+ return "text" in event ? event.text.trim() : "";
59543
59712
  }
59544
59713
  function contextAfterReference(events) {
59545
59714
  const parts2 = [];
@@ -63366,6 +63535,21 @@ var handleHelloRequest = (client, m, d) => {
63366
63535
  m.replayLocal(client);
63367
63536
  };
63368
63537
 
63538
+ // src/commands/sessions/daemon/handleInterrupt.ts
63539
+ var handleInterrupt = routed((_client, m, d) => {
63540
+ const id = String(d.sessionId);
63541
+ const session = m.session(id);
63542
+ const sdk = session?.pty?.sdk;
63543
+ if (!sdk) {
63544
+ daemonLog(
63545
+ `interrupt ignored: session ${id} ${session ? "is not a Claude (SDK) session" : "was not found"}`
63546
+ );
63547
+ return;
63548
+ }
63549
+ daemonLog(`interrupt received: session ${id}`);
63550
+ sdk.interrupt();
63551
+ });
63552
+
63369
63553
  // src/commands/sessions/daemon/handleWebLog.ts
63370
63554
  var handleWebLog = (client, _m, d) => {
63371
63555
  daemonLog(`web: ${String(d.message)}`);
@@ -64525,6 +64709,7 @@ var messageHandlers = {
64525
64709
  dismiss: handleDismiss,
64526
64710
  discard: routed((_client, m, d) => m.discardSession(d.sessionId)),
64527
64711
  stop: routed((_client, m, d) => m.stopSession(d.sessionId)),
64712
+ interrupt: handleInterrupt,
64528
64713
  transfer: handleTransfer,
64529
64714
  "cancel-transfer": handleCancelTransfer,
64530
64715
  ...sessionSettingHandlers,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.1134.0",
3
+ "version": "0.1135.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {