@norman-else/dsh-claude 0.1.15 → 0.1.16

package/lib/index.d.mts

@@ -174,6 +174,9 @@ type ClaudeTurnStreamEvent = {
 } | {
   type: 'usage';
   usage: ClaudeUsage;
+} | {
+  type: 'segment-complete';
+  text: string;
 } | {
   type: 'complete';
   text: string;

package/lib/index.mjs

@@ -1007,6 +1007,11 @@ function sdkUserMessage(prompt, uuid) {
 		uuid
 	};
 }
+const BACKGROUND_TASK_REPORT_PROMPT = [
+	"The background tasks launched by your preceding response have now all settled.",
+	"Report their final completed or failed outcomes concisely to the user.",
+	"Do not start new tools or tasks, and do not repeat the earlier progress update."
+].join(" ");
 /** CLI ≥ 2.1.235 emits system/init only after its first stdin input, while
 *  the supervisor must see init before submitting any real turn. A local
 *  slash command nudges startup without costing a model call; its lifecycle
@@ -1125,6 +1130,7 @@ var ClaudeSupervisor = class {
 			cursor,
 			output: new AsyncQueue(),
 			promptUuid,
+			phase: "primary",
 			sawActivity: false,
 			sawTextDelta: false,
 			text: "",
@@ -1369,7 +1375,7 @@ var ClaudeSupervisor = class {
 		}
 		const taskId = message.kind === "subagent" ? message.taskId : void 0;
 		if (message.kind === "subagent" && taskId !== void 0) await this.#trackTask(entry, message, taskId, entry.active?.cursor.turn);
-		else if (message.kind === "background-tasks") this.#trackBackgroundLevel(entry, message.tasks, entry.active?.cursor.turn);
+		else if (message.kind === "background-tasks") await this.#trackBackgroundLevel(entry, message.tasks, entry.active?.cursor.turn);
 		if (entry.handshakePending) {
 			if (message.kind === "protocol-error") throw new ClaudeProtocolError(`${message.title}: ${JSON.stringify(message.detail).slice(0, 1e3)}`);
 			if (message.kind === "result") entry.handshakePending = false;
@@ -1515,10 +1521,11 @@ var ClaudeSupervisor = class {
 		entry.tasks.set(taskId, next);
 		const settled = next.status !== "running";
 		await this.#scheduleTasksSnapshot(entry, settled);
+		if (settled) await this.#continueAfterTasks(entry);
 	}
 	/** Fold the background-task level signal into the board (REPLACE semantics
 	*  for the backgrounded flag: only the listed tasks are detached). */
-	#trackBackgroundLevel(entry, tasks, originTurn) {
+	async #trackBackgroundLevel(entry, tasks, originTurn) {
 		const live = new Set(tasks.map((task) => task.taskId));
 		let changed = false;
 		for (const task of tasks) {
@@ -1549,7 +1556,28 @@ var ClaudeSupervisor = class {
 			});
 			changed = true;
 		}
-		if (changed) this.#scheduleTasksSnapshot(entry, true);
+		if (changed) {
+			await this.#scheduleTasksSnapshot(entry, true);
+			await this.#continueAfterTasks(entry);
+		}
+	}
+	#hasRunningTasks(entry, active) {
+		return [...entry.tasks.values()].some((task) => task.originTurn === active.cursor.turn && task.backgrounded === true && task.status === "running");
+	}
+	async #continueAfterTasks(entry) {
+		const active = entry.active;
+		if (active === void 0 || active.phase !== "waiting-tasks" || this.#hasRunningTasks(entry, active)) return;
+		active.phase = "follow-up";
+		active.promptUuid = randomUUID();
+		active.sawTextDelta = false;
+		active.text = "";
+		active.thinking = "";
+		await this.#appendSafely(active, {
+			kind: "status",
+			phase: "updated",
+			title: "Claude Code is reporting background task results"
+		});
+		entry.input.push(sdkUserMessage(BACKGROUND_TASK_REPORT_PROMPT, active.promptUuid));
 	}
 	/** Persist the task board. Settled transitions flush immediately; progress
 	*  ticks throttle to one snapshot per second to bound log volume. */
@@ -1578,7 +1606,6 @@ var ClaudeSupervisor = class {
 	}
 	async #completeTurn(entry, active, result) {
 		if (entry.active !== active) return;
-		if (active.signal !== void 0 && active.abortListener !== void 0) active.signal.removeEventListener("abort", active.abortListener);
 		if (active.aborted) {
 			await this.#appendSafely(active, {
 				kind: "status",
@@ -1629,6 +1656,19 @@ var ClaudeSupervisor = class {
 					text: result.text
 				});
 			}
+			if (active.phase === "primary" && this.#hasRunningTasks(entry, active)) {
+				active.phase = "waiting-tasks";
+				await this.#appendSafely(active, {
+					kind: "status",
+					phase: "updated",
+					title: "Claude Code is waiting for background tasks"
+				});
+				active.output.push({
+					type: "segment-complete",
+					text: active.text
+				});
+				return;
+			}
 			await this.#appendSafely(active, {
 				kind: "status",
 				phase: "completed",
@@ -1640,6 +1680,7 @@ var ClaudeSupervisor = class {
 			});
 			active.output.close();
 		}
+		if (active.signal !== void 0 && active.abortListener !== void 0) active.signal.removeEventListener("abort", active.abortListener);
 		entry.active = void 0;
 		entry.state = "idle";
 		entry.lastUsedAt = Date.now();
@@ -2041,31 +2082,35 @@ var ClaudeCodeAdapter = class extends LlmAdapter {
 		let text = "";
 		let pendingUsage;
 		let completed = false;
+		let blockIndex = 0;
 		try {
 			for await (const event of events) if (event.type === "text-delta") text += event.text;
 			else if (event.type === "usage") pendingUsage = tokenUsage(event.usage);
 			else {
-				completed = true;
 				if (text.length > 0) {
 					yield {
 						type: "block-start",
-						index: 0,
+						index: blockIndex,
 						blockType: "text"
 					};
 					yield {
 						type: "text-delta",
-						index: 0,
+						index: blockIndex,
 						text
 					};
 					yield {
 						type: "block-end",
-						index: 0,
+						index: blockIndex,
 						block: {
 							type: "text",
 							text
 						}
 					};
+					blockIndex += 1;
 				}
+				text = "";
+				if (event.type === "segment-complete") continue;
+				completed = true;
 				if (pendingUsage !== void 0) yield {
 					type: "usage",
 					usage: pendingUsage
@@ -2081,17 +2126,17 @@ var ClaudeCodeAdapter = class extends LlmAdapter {
 				if (text.length > 0) {
 					yield {
 						type: "block-start",
-						index: 0,
+						index: blockIndex,
 						blockType: "text"
 					};
 					yield {
 						type: "text-delta",
-						index: 0,
+						index: blockIndex,
 						text
 					};
 					yield {
 						type: "block-end",
-						index: 0,
+						index: blockIndex,
 						block: {
 							type: "text",
 							text