@xopcai/xopc 0.0.180 → 0.0.188

package/dist/src/discussions/service.js

@@ -1,9 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
-import { buildNoteAttachmentRef } from "../notes/attachment-ref.js";
 import { ObjectLinkService } from "../activity/service.js";
-import { acknowledgeDiscussionCaptureConsent, createDiscussionCapture, createDiscussionTranscriptSegment, deleteDiscussionSegmentAudio, getDiscussionCapture, getDiscussionCaptureByClientRequestId, getDiscussionCaptureByNoteId, getDiscussionCaptureSettings, getDiscussionMetrics, getDiscussionTranscriptSegment, listDiscussionCaptures, listDiscussionTranscriptSegments, updateDiscussionCapture } from "./repository.js";
+import { acknowledgeDiscussionCaptureConsent, correctDiscussionTranscriptSegment, createDiscussionCapture, createDiscussionTranscriptSegment, deleteDiscussionSegmentAudio, getDiscussionCapture, getDiscussionCaptureByClientRequestId, getDiscussionCaptureByNoteId, getDiscussionCaptureSettings, getDiscussionMetrics, getDiscussionTranscriptSegment, getLatestDiscussionOrganization, listDiscussionCaptures, listDiscussionTranscriptSegments, updateDiscussionCapture } from "./repository.js";
 import { assembleDiscussionTranscript } from "./transcript.js";
 import { createHash, randomUUID } from "node:crypto";
 //#region src/discussions/service.ts
@@ -19,9 +18,6 @@ function isSupportedAudioMimeType(mimeType) {
 function placeholderTitle(now) {
 	return `Discussion · ${new Date(now).toISOString().slice(0, 16).replace("T", " ")}`;
 }
-function escapeRegExp(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 var DiscussionServiceError = class extends Error {
 	constructor(code, message) {
 		super(message);
@@ -68,7 +64,7 @@ var DiscussionService = class {
 		const title = placeholderTitle(now);
 		const note = await this.notes.createNote({
 			title,
-			markdown: `# ${title}\n\n> Recording in progress. Live transcript will appear here.`,
+			markdown: "",
 			kind: "voice",
 			capturedVia: { channel: input.source }
 		});
@@ -83,9 +79,7 @@ var DiscussionService = class {
 			} : {},
 			source: input.source,
 			status: "recording",
-			processingStage: "original_upload",
-			finalizationRevision: 0,
-			attemptCount: 0,
+			transcriptRevision: 0,
 			recordingStartedAt: now,
 			createdAt: now,
 			updatedAt: now
@@ -121,10 +115,7 @@ var DiscussionService = class {
 			projectId: project?.id
 		}, "Discussion recording started");
 		this.emit?.("discussion.updated", discussion);
-		return {
-			discussion,
-			note
-		};
+		return this.detail(discussion);
 	}
 	async get(id) {
 		const capture = getDiscussionCapture(id);
@@ -141,18 +132,28 @@ var DiscussionService = class {
 		return getDiscussionMetrics();
 	}
 	transcript(id) {
-		if (!getDiscussionCapture(id)) return null;
+		const capture = getDiscussionCapture(id);
+		if (!capture) return null;
 		const segments = listDiscussionTranscriptSegments(id);
+		const count = (status) => segments.filter((segment) => segment.status === status).length;
 		return {
 			discussionId: id,
+			revision: capture.transcriptRevision,
 			segments,
-			text: assembleDiscussionTranscript(segments)
+			text: capture.canonicalTranscript ?? assembleDiscussionTranscript(segments),
+			stats: {
+				...capture.expectedLastSequence != null ? { expected: capture.expectedLastSequence + 1 } : {},
+				uploaded: count("uploaded"),
+				transcribing: count("transcribing"),
+				confirmed: count("confirmed"),
+				failed: count("failed")
+			}
 		};
 	}
 	uploadSegment(input) {
 		const capture = getDiscussionCapture(input.discussionId);
 		if (!capture) throw new DiscussionServiceError("not_found", "Discussion not found");
-		if (capture.status !== "recording") throw new DiscussionServiceError("conflict", "Discussion is no longer recording");
+		if (capture.status !== "recording" && capture.status !== "stopping") throw new DiscussionServiceError("conflict", "Discussion no longer accepts transcript segments");
 		if (!Number.isInteger(input.sequence) || input.sequence < 0 || input.sequence > 2e3) throw new DiscussionServiceError("invalid_input", "Invalid segment sequence");
 		if (input.file.mimeType !== "audio/wav" && input.file.mimeType !== "audio/x-wav") throw new DiscussionServiceError("invalid_input", "Live transcript segments must be WAV audio");
 		if (input.file.buffer.length === 0 || input.file.buffer.length > 2097152) throw new DiscussionServiceError("invalid_input", "Live transcript segment is empty or too large");
@@ -170,18 +171,42 @@ var DiscussionService = class {
 				startedAtMs: Math.round(input.startedAtMs),
 				endedAtMs: Math.round(input.endedAtMs)
 			});
-			this.emit?.("discussion.transcript.updated", {
+			const transcript = this.transcript(input.discussionId);
+			this.emit?.("discussion.segment.updated", {
 				discussionId: input.discussionId,
-				sequence: input.sequence
+				noteId: capture.noteId,
+				transcriptRevision: transcript.revision,
+				segment: transcript.segments.find((item) => item.sequence === input.sequence),
+				text: transcript.text,
+				stats: transcript.stats
 			});
 		}
 		return this.transcript(input.discussionId);
 	}
+	correctSegment(id, sequence, displayText, expectedRevision) {
+		const capture = getDiscussionCapture(id);
+		if (!capture) throw new DiscussionServiceError("not_found", "Discussion not found");
+		if (capture.status !== "recording" && capture.status !== "stopping") throw new DiscussionServiceError("conflict", "The sealed transcript cannot be changed");
+		const text = displayText.trim();
+		if (!text || text.length > 2e4) throw new DiscussionServiceError("invalid_input", "Invalid transcript text");
+		const segment = correctDiscussionTranscriptSegment(id, sequence, text, expectedRevision);
+		if (!segment) throw new DiscussionServiceError("conflict", "Transcript segment changed; reload and try again");
+		const transcript = this.transcript(id);
+		this.emit?.("discussion.segment.updated", {
+			discussionId: id,
+			noteId: capture.noteId,
+			transcriptRevision: transcript.revision,
+			segment,
+			text: transcript.text,
+			stats: transcript.stats
+		});
+		return transcript;
+	}
 	async uploadRecording(id, file, durationMs) {
 		return this.enqueueMutation(id, async () => {
 			const capture = getDiscussionCapture(id);
 			if (!capture) return null;
-			if (capture.status !== "recording") throw new DiscussionServiceError("conflict", "Discussion is no longer recording");
+			if (capture.status !== "recording" && capture.status !== "stopping") throw new DiscussionServiceError("conflict", "Discussion no longer accepts its recording");
 			if (!Number.isFinite(durationMs) || durationMs < 1e3 || durationMs > 18e5) throw new DiscussionServiceError("invalid_input", "durationMs must be between 1000 and 1800000");
 			if (!isSupportedAudioMimeType(file.mimeType)) throw new DiscussionServiceError("invalid_input", "Unsupported audio type");
 			if (file.buffer.length === 0 || file.buffer.length > 26214400) throw new DiscussionServiceError("invalid_input", "Audio must be between 1 byte and 25MB");
@@ -190,8 +215,6 @@ var DiscussionService = class {
 				if (capture.audioSha256 === audioSha256) return this.detail(capture);
 				throw new DiscussionServiceError("conflict", "Discussion already has different audio");
 			}
-			const noteBefore = await this.notes.getNote(capture.noteId);
-			if (!noteBefore) throw new DiscussionServiceError("not_found", "Discussion note not found");
 			const attachment = await this.notes.addAttachment(capture.noteId, {
 				name: file.name.trim().slice(0, 200) || `discussion-${id}.webm`,
 				buffer: file.buffer,
@@ -199,47 +222,39 @@ var DiscussionService = class {
 				duration: Math.round(durationMs / 1e3)
 			});
 			if (!attachment) throw new DiscussionServiceError("not_found", "Discussion note not found");
-			const audioRef = buildNoteAttachmentRef(capture.noteId, attachment.id);
 			try {
-				if (!noteBefore.markdown.includes(`](${audioRef})`)) {
-					if (!await this.notes.updateNote(capture.noteId, { markdown: `${noteBefore.markdown.trim()}\n\n[Discussion audio](${audioRef})` })) throw new DiscussionServiceError("not_found", "Discussion note not found");
-				}
 				const updated = updateDiscussionCapture(id, {
 					audioAttachmentId: attachment.id,
 					durationMs: Math.round(durationMs),
 					mimeType: file.mimeType,
 					audioSizeBytes: file.buffer.length,
 					audioSha256
-				}, ["recording"]);
+				}, ["recording", "stopping"]);
 				if (!updated) throw new DiscussionServiceError("conflict", "Discussion changed while storing audio");
 				this.emit?.("discussion.updated", updated);
 				return this.detail(updated);
 			} catch (error) {
-				await this.notes.updateNote(capture.noteId, { markdown: noteBefore.markdown }).catch(() => void 0);
 				await this.notes.removeAttachment(capture.noteId, attachment.id).catch(() => void 0);
 				throw error;
 			}
 		});
 	}
-	async finish(id, lastSequence, durationMs) {
+	async stop(id, lastSequence, durationMs) {
 		return this.enqueueMutation(id, async () => {
 			const capture = getDiscussionCapture(id);
 			if (!capture) return null;
-			if (capture.status === "finalizing" || capture.status === "completed") return this.detail(capture);
-			if (capture.status !== "recording") throw new DiscussionServiceError("conflict", "Discussion cannot be finished");
-			if (!capture.audioAttachmentId) throw new DiscussionServiceError("conflict", "Original recording has not been uploaded");
+			if (capture.status === "stopping" || capture.status === "sealing" || capture.status === "organizing" || capture.status === "completed") return this.detail(capture);
+			if (capture.status !== "recording") throw new DiscussionServiceError("conflict", "Discussion cannot be stopped");
 			if (!Number.isInteger(lastSequence) || lastSequence < -1 || lastSequence > 2e3) throw new DiscussionServiceError("invalid_input", "Invalid final segment sequence");
 			if (!Number.isFinite(durationMs) || durationMs < 1e3 || durationMs > 18e5) throw new DiscussionServiceError("invalid_input", "Invalid recording duration");
 			const updated = updateDiscussionCapture(id, {
-				status: "finalizing",
-				processingStage: "final_transcription",
+				status: "stopping",
 				expectedLastSequence: lastSequence,
 				durationMs: Math.round(durationMs),
-				recordingFinishedAt: Date.now(),
-				attemptCount: 0,
-				nextAttemptAt: void 0,
-				lastErrorCode: void 0,
-				lastErrorMessage: void 0
+				recordingStoppedAt: Date.now(),
+				failureStage: void 0,
+				failureCode: void 0,
+				failureMessage: void 0
 			}, ["recording"]);
 			if (!updated) throw new DiscussionServiceError("conflict", "Discussion changed while finishing");
 			this.emit?.("discussion.updated", updated);
@@ -249,17 +264,14 @@ var DiscussionService = class {
 	async retry(id) {
 		const capture = getDiscussionCapture(id);
 		if (!capture) return null;
-		if (capture.status !== "failed") throw new DiscussionServiceError("conflict", "Only failed discussions can be retried");
+		if (capture.status !== "needs_attention") throw new DiscussionServiceError("conflict", "Only discussions needing attention can be retried");
 		const updated = updateDiscussionCapture(id, {
-			status: "finalizing",
-			processingStage: capture.processingStage ?? "final_transcription",
-			attemptCount: 0,
-			nextAttemptAt: void 0,
-			leaseOwner: void 0,
-			leaseExpiresAt: void 0,
-			lastErrorCode: void 0,
-			lastErrorMessage: void 0
-		}, ["failed"]);
+			status: capture.canonicalTranscript ? "organizing" : "stopping",
+			...!capture.canonicalTranscript ? { recordingStoppedAt: Date.now() } : {},
+			failureStage: void 0,
+			failureCode: void 0,
+			failureMessage: void 0
+		}, ["needs_attention"]);
 		if (!updated) throw new DiscussionServiceError("conflict", "Discussion changed while retrying");
 		this.emit?.("discussion.updated", updated);
 		return this.detail(updated);
@@ -268,11 +280,8 @@ var DiscussionService = class {
 		const capture = getDiscussionCapture(id);
 		if (!capture) return null;
 		if (capture.status === "cancelled") return this.detail(capture);
-		if (capture.status !== "recording") throw new DiscussionServiceError("conflict", "Only an active recording can be cancelled");
-		const updated = updateDiscussionCapture(id, {
-			status: "cancelled",
-			processingStage: void 0
-		}, ["recording"]);
+		if (capture.status !== "recording" && capture.status !== "stopping") throw new DiscussionServiceError("conflict", "Only an active recording can be cancelled");
+		const updated = updateDiscussionCapture(id, { status: "cancelled" }, ["recording", "stopping"]);
 		if (!updated) throw new DiscussionServiceError("conflict", "Discussion changed while cancelling");
 		deleteDiscussionSegmentAudio(id);
 		this.emit?.("discussion.updated", updated);
@@ -282,13 +291,12 @@ var DiscussionService = class {
 		return this.enqueueMutation(id, async () => {
 			const capture = getDiscussionCapture(id);
 			if (!capture) return null;
-			if (capture.status === "recording" || capture.status === "finalizing") throw new DiscussionServiceError("conflict", "Audio cannot be deleted while recording or finalizing");
+			if (![
+				"completed",
+				"needs_attention",
+				"cancelled"
+			].includes(capture.status)) throw new DiscussionServiceError("conflict", "Audio cannot be deleted while discussion processing is active");
 			if (!capture.audioAttachmentId) return this.detail(capture);
-			const note = await this.notes.getNote(capture.noteId);
-			if (!note) throw new DiscussionServiceError("not_found", "Discussion note not found");
-			const audioRef = buildNoteAttachmentRef(capture.noteId, capture.audioAttachmentId);
-			const markdown = note.markdown.replace(new RegExp(`^\\[Discussion audio\\]\\(${escapeRegExp(audioRef)}\\)\\s*$`, "gm"), "").replace(/\n{3,}/g, "\n\n").trim();
-			if (markdown !== note.markdown) await this.notes.updateNote(capture.noteId, { markdown });
 			await this.notes.removeAttachment(capture.noteId, capture.audioAttachmentId);
 			deleteDiscussionSegmentAudio(id);
 			const updated = updateDiscussionCapture(id, {
@@ -319,7 +327,9 @@ var DiscussionService = class {
 		if (!note) throw new DiscussionServiceError("not_found", "Discussion note not found");
 		return {
 			discussion: capture,
-			note
+			note,
+			transcript: this.transcript(capture.id),
+			...getLatestDiscussionOrganization(capture.id) ? { organization: getLatestDiscussionOrganization(capture.id) } : {}
 		};
 	}
 	enqueueMutation(id, mutation) {

package/dist/src/discussions/transcript.js

@@ -9,7 +9,7 @@ function appendTranscriptWithoutOverlap(existing, next) {
 	return `${left}\n${right}`;
 }
 function assembleDiscussionTranscript(segments) {
-	return segments.reduce((text, segment) => appendTranscriptWithoutOverlap(text, segment.transcript ?? ""), "");
+	return segments.reduce((text, segment) => appendTranscriptWithoutOverlap(text, segment.displayText ?? ""), "");
 }
 //#endregion
 export { appendTranscriptWithoutOverlap, assembleDiscussionTranscript };

package/dist/src/discussions/types.d.ts

@@ -1,15 +1,16 @@
-export declare const DISCUSSION_STATUSES: readonly ["recording", "finalizing", "completed", "failed", "cancelled"];
+export declare const DISCUSSION_STATUSES: readonly ["recording", "stopping", "sealing", "organizing", "completed", "needs_attention", "cancelled"];
 export type DiscussionStatus = typeof DISCUSSION_STATUSES[number];
-export type DiscussionProcessingStage = 'original_upload' | 'final_transcription' | 'analysis' | 'note_write';
 export type DiscussionSource = 'web' | 'electron';
 export type DiscussionProjectInferenceSource = 'context' | 'exact_name' | 'model';
+export type DiscussionFailureStage = 'segment_upload' | 'segment_transcription' | 'audio_upload' | 'transcript_sealing' | 'organization';
 export interface DiscussionActionItem {
     id: string;
     title: string;
     owner?: string;
     dueDate?: string;
+    evidenceSegmentIds?: number[];
 }
-export interface DiscussionAnalysis {
+export interface DiscussionOrganization {
     title: string;
     summary: string;
     keyPoints: string[];
@@ -29,45 +30,45 @@ export interface DiscussionCapture {
     audioAttachmentId?: string;
     source: DiscussionSource;
     status: DiscussionStatus;
-    processingStage?: DiscussionProcessingStage;
     durationMs?: number;
     expectedLastSequence?: number;
     mimeType?: string;
     audioSizeBytes?: number;
     audioSha256?: string;
-    transcriptRaw?: string;
-    transcriptSha256?: string;
+    canonicalTranscript?: string;
+    canonicalTranscriptSha256?: string;
     transcriptLanguage?: string;
-    sttProvider?: string;
-    analysis?: DiscussionAnalysis;
-    analysisInputHash?: string;
-    analyzerModelRef?: string;
+    transcriptRevision: number;
     generatedTitle?: string;
     projectInferenceScore?: number;
     projectInferenceSource?: DiscussionProjectInferenceSource;
-    finalizationRevision: number;
-    attemptCount: number;
-    nextAttemptAt?: number;
-    leaseOwner?: string;
-    leaseExpiresAt?: number;
-    lastErrorCode?: string;
-    lastErrorMessage?: string;
+    failureStage?: DiscussionFailureStage;
+    failureCode?: string;
+    failureMessage?: string;
     recordingStartedAt: number;
-    recordingFinishedAt?: number;
+    recordingStoppedAt?: number;
     createdAt: number;
     updatedAt: number;
     completedAt?: number;
     audioDeletedAt?: number;
 }
+export type DiscussionTranscriptSegmentStatus = 'uploaded' | 'transcribing' | 'confirmed' | 'failed';
 export interface DiscussionTranscriptSegment {
     discussionId: string;
     sequence: number;
     audioSha256: string;
     startedAtMs: number;
     endedAtMs: number;
-    status: 'uploaded' | 'transcribing' | 'completed' | 'failed';
-    transcript?: string;
+    status: DiscussionTranscriptSegmentStatus;
+    rawText?: string;
+    displayText?: string;
+    language?: string;
     provider?: string;
+    confidence?: number;
+    speakerLabel?: string;
+    revision: number;
+    correctedByUser: boolean;
+    correctedAt?: number;
     attemptCount: number;
     nextAttemptAt?: number;
     leaseOwner?: string;
@@ -76,10 +77,32 @@ export interface DiscussionTranscriptSegment {
     createdAt: number;
     updatedAt: number;
 }
+export interface DiscussionTranscriptStats {
+    expected?: number;
+    uploaded: number;
+    transcribing: number;
+    confirmed: number;
+    failed: number;
+}
 export interface DiscussionTranscript {
     discussionId: string;
+    revision: number;
     segments: DiscussionTranscriptSegment[];
     text: string;
+    stats: DiscussionTranscriptStats;
+}
+export interface DiscussionOrganizationRecord {
+    id: string;
+    discussionId: string;
+    revision: number;
+    inputTranscriptSha256: string;
+    promptVersion: string;
+    modelRef: string;
+    organization?: DiscussionOrganization;
+    status: 'running' | 'completed' | 'failed';
+    errorMessage?: string;
+    createdAt: number;
+    completedAt?: number;
 }
 export interface DiscussionCaptureSettings {
     consentPolicyVersion: number;
@@ -113,4 +136,6 @@ export interface DiscussionMetrics {
 export interface DiscussionDetail {
     discussion: DiscussionCapture;
     note: import('../notes/types.js').Note;
+    transcript: DiscussionTranscript;
+    organization?: DiscussionOrganizationRecord;
 }

package/dist/src/discussions/types.js

@@ -1,9 +1,11 @@
 //#region src/discussions/types.ts
 const DISCUSSION_STATUSES = [
 	"recording",
-	"finalizing",
+	"stopping",
+	"sealing",
+	"organizing",
 	"completed",
-	"failed",
+	"needs_attention",
 	"cancelled"
 ];
 //#endregion

package/dist/src/extensions/extension-registry-impl.d.ts

@@ -17,6 +17,7 @@ export declare class ExtensionRegistryImpl implements ExtensionRegistry {
     services: Map<string, ExtensionService>;
     gatewayMethods: Map<string, GatewayMethodHandler>;
     tools: Map<string, AgentTool<any, any>>;
+    private toolExtensionIds;
     channelPlugins: ChannelPlugin[];
     private cliRegistrations;
     private reloadRegistrations;
@@ -36,10 +37,11 @@ export declare class ExtensionRegistryImpl implements ExtensionRegistry {
     getService(id: string): ExtensionService | undefined;
     addGatewayMethod(method: string, handler: GatewayMethodHandler): void;
     getGatewayMethod(method: string): GatewayMethodHandler | undefined;
-    addTool(tool: any): void;
+    addTool(tool: any, extensionId: string): void;
     removeTool(name: string): void;
     getTools(): Map<string, any>;
     getTool(name: string): any | undefined;
+    getToolExtensionId(name: string): string | undefined;
     getAllTools(): any[];
     addCliRegistration(reg: ExtensionCliRegistration): void;
     getCliRegistrations(): readonly ExtensionCliRegistration[];

package/dist/src/extensions/extension-registry-impl.js

@@ -11,6 +11,7 @@ var ExtensionRegistryImpl = class {
 	services = /* @__PURE__ */ new Map();
 	gatewayMethods = /* @__PURE__ */ new Map();
 	tools = /* @__PURE__ */ new Map();
+	toolExtensionIds = /* @__PURE__ */ new Map();
 	channelPlugins = [];
 	cliRegistrations = [];
 	reloadRegistrations = [];
@@ -64,12 +65,14 @@ var ExtensionRegistryImpl = class {
 	getGatewayMethod(method) {
 		return this.gatewayMethods.get(method);
 	}
-	addTool(tool) {
+	addTool(tool, extensionId) {
 		if (this.tools.has(tool.name)) log.warn({ tool: tool.name }, `Tool already registered, overwriting`);
 		this.tools.set(tool.name, tool);
+		this.toolExtensionIds.set(tool.name, extensionId);
 	}
 	removeTool(name) {
 		this.tools.delete(name);
+		this.toolExtensionIds.delete(name);
 	}
 	getTools() {
 		return this.tools;
@@ -77,6 +80,9 @@ var ExtensionRegistryImpl = class {
 	getTool(name) {
 		return this.tools.get(name);
 	}
+	getToolExtensionId(name) {
+		return this.toolExtensionIds.get(name);
+	}
 	getAllTools() {
 		return Array.from(this.tools.values());
 	}

package/dist/src/extensions/loader.js

@@ -441,7 +441,7 @@ var ExtensionLoader = class {
 				source: config.source
 			});
 			const extensionTools = api._getTools();
-			for (const tool of extensionTools.values()) this.registry.addTool(tool);
+			for (const tool of extensionTools.values()) this.registry.addTool(tool, config.id);
 			this.extensionInstances.set(config.id, api);
 			this.cache.set(cacheKey, api);
 			this.diagnostics.info(config.id, `Loaded extension: ${manifest.name}`);

package/dist/src/extensions/lockfile.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
 import { init_paths, resolveExtensionsDir, resolveExtensionsLockPath } from "../config/paths.js";
+import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
 import { dirname, join } from "path";
 import { existsSync } from "fs";
 import { mkdir, readFile } from "fs/promises";

package/dist/src/extensions/types/core.d.ts

@@ -52,7 +52,7 @@ export interface ExtensionRuntime {
     log: ExtensionLogger;
     sessionManager?: ExtensionSessionManager;
     /**
-     * Queue another webchat agent turn (same as POST /api/agent) after the current run unlocks.
+     * Queue another durable webchat input after the current run unlocks.
      * Only injected in the Gateway process.
      */
     scheduleWebchatContinuation?: (sessionKey: string, message: string) => void;
@@ -67,7 +67,7 @@ export interface ExtensionRuntime {
 }
 export type ExtensionUserMessageContent = string | (TextContent | ImageContent)[];
 export interface ExtensionSendUserMessageOptions {
-    deliverAs?: 'steer' | 'followUp';
+    deliverAs?: 'steer' | 'next';
 }
 export interface ExtensionCustomMessage<T = unknown> {
     customType: string;
@@ -77,7 +77,7 @@ export interface ExtensionCustomMessage<T = unknown> {
 }
 export interface ExtensionSendMessageOptions {
     triggerTurn?: boolean;
-    deliverAs?: 'steer' | 'followUp' | 'nextTurn';
+    deliverAs?: 'steer' | 'next' | 'nextTurn';
 }
 export interface ExtensionCliRegistration {
     extensionId: string;
@@ -237,9 +237,10 @@ export interface ExtensionService {
     stop?: () => void | Promise<void>;
 }
 export interface ExtensionRegistry {
-    addTool(tool: AgentTool): void;
+    addTool(tool: AgentTool, extensionId: string): void;
     getTools(): Map<string, AgentTool>;
     getTool(name: string): AgentTool | undefined;
+    getToolExtensionId(name: string): string | undefined;
     getAllTools(): AgentTool[];
     getCommand(name: string): ExtensionCommand | undefined;
     addCliRegistration(reg: ExtensionCliRegistration): void;

package/dist/src/extensions/types/tui.d.ts

@@ -246,14 +246,14 @@ export interface TuiReplacementResult {
 export interface TuiReplacedSessionContext extends TuiActionContext {
     sendMessage<T = unknown>(message: TuiCustomMessage<T>, options?: {
         triggerTurn?: boolean;
-        deliverAs?: 'steer' | 'followUp' | 'nextTurn';
+        deliverAs?: 'steer' | 'next' | 'nextTurn';
     }): Promise<void>;
     sendUserMessage(content: string | Array<{
         type: string;
         text?: string;
         [key: string]: unknown;
     }>, options?: {
-        deliverAs?: 'steer' | 'followUp';
+        deliverAs?: 'steer' | 'next';
     }): Promise<void>;
 }
 export interface TuiNewSessionOptions {

package/dist/src/extensions/update.d.ts

@@ -9,7 +9,7 @@ export type ExtensionUpdateLogger = {
     error?: (message: string) => void;
 };
 export type ExtensionUpdateStatus = 'updated' | 'unchanged' | 'skipped' | 'error';
-export type ExtensionUpdateOutcome = {
+export type ExtensionUpdateTask = {
     extensionId: string;
     status: ExtensionUpdateStatus;
     message: string;
@@ -22,7 +22,7 @@ export type ExtensionChannelSyncSummary = {
 };
 export type ExtensionPostUpdateResult = {
     status: 'ok' | 'error' | 'skipped';
-    outcomes: ExtensionUpdateOutcome[];
+    tasks: ExtensionUpdateTask[];
     channelSync?: ExtensionChannelSyncSummary;
 };
 export declare function syncExtensionsForUpdateChannel(params: {
@@ -40,7 +40,7 @@ export declare function updateNpmInstalledExtensions(params: {
     timeoutMs?: number;
     logger?: ExtensionUpdateLogger;
 }): Promise<{
-    outcomes: ExtensionUpdateOutcome[];
+    tasks: ExtensionUpdateTask[];
     status: 'ok' | 'error' | 'skipped';
 }>;
 export declare function runPostUpdateExtensionSync(params: {

package/dist/src/extensions/update.js

@@ -4,8 +4,8 @@ import { init_paths, resolveBundledExtensionsDir, resolveExtensionsDir } from ".
 import { init_loader, loadConfig } from "../config/loader.js";
 import { downloadExtensionStoreZipBuffer, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, verifyStoreArtifactSha256 } from "../agent/skills/marketplace/adapters/store/store-api-client.js";
 import { getExtensionLockfileManager } from "./lockfile.js";
-import { installExtensionFromStoreZip, installFromNpm } from "./install.js";
 import { findExtension } from "./marketplace.js";
+import { installExtensionFromStoreZip, installFromNpm } from "./install.js";
 import { join } from "node:path";
 import { existsSync, readFileSync, readdirSync, rmSync } from "node:fs";
 import semver from "semver";
@@ -189,14 +189,14 @@ async function updateNpmInstalledExtensions(params) {
 	const data = await lock.load();
 	const ids = params.extensionIds?.length ? params.extensionIds : Object.keys(data.extensions);
 	if (ids.length === 0) return {
-		outcomes: [],
+		tasks: [],
 		status: "skipped"
 	};
-	const outcomes = [];
+	const tasks = [];
 	let hasError = false;
 	for (const extensionId of ids) {
 		if (params.skipIds?.has(extensionId)) {
-			outcomes.push({
+			tasks.push({
 				extensionId,
 				status: "skipped",
 				message: `Skipping "${extensionId}" (channel sync).`
@@ -205,14 +205,14 @@ async function updateNpmInstalledExtensions(params) {
 		}
 		const entry = data.extensions[extensionId];
 		if (!entry) {
-			outcomes.push({
+			tasks.push({
 				extensionId,
 				status: "skipped",
 				message: `No lockfile entry for "${extensionId}".`
 			});
 			continue;
 		}
-		const outcome = await updateSingleExtension({
+		const task = await updateSingleExtension({
 			extensionId,
 			entry,
 			targetDir,
@@ -221,15 +221,15 @@ async function updateNpmInstalledExtensions(params) {
 			timeoutMs: params.timeoutMs,
 			logger
 		});
-		outcomes.push(outcome);
-		if (outcome.status === "error") hasError = true;
-		else if (outcome.status === "updated") log.info({
-			extensionId: outcome.extensionId,
-			nextVersion: outcome.nextVersion
-		}, outcome.message);
+		tasks.push(task);
+		if (task.status === "error") hasError = true;
+		else if (task.status === "updated") log.info({
+			extensionId: task.extensionId,
+			nextVersion: task.nextVersion
+		}, task.message);
 	}
 	return {
-		outcomes,
+		tasks,
 		status: hasError ? "error" : "ok"
 	};
 }
@@ -252,7 +252,7 @@ async function runPostUpdateExtensionSync(params) {
 	});
 	return {
 		status: updateResult.status,
-		outcomes: updateResult.outcomes,
+		tasks: updateResult.tasks,
 		channelSync: channelSyncResult.summary
 	};
 }

package/dist/src/gateway/agent-builtin-tools.d.ts

@@ -2,5 +2,5 @@
  * Built-in agent tool `name` values for gateway admin UI (disable toggles).
  * Extension tools are not listed; users can still add arbitrary strings in config.
  */
-export declare const GATEWAY_BUILTIN_TOOL_IDS: readonly ["code_search", "code_read_symbol", "code_trace", "code_impact", "code_architecture", "read_file", "write_file", "apply_patch", "list_dir", "grep", "find", "exec_command", "update_plan", "session_status", "dreaming", "tool_manual", "clarify", "todo", "skills_list", "skill_view", "skill_manage", "skills_marketplace_search", "skill_install", "web_search", "web_fetch", "web_extract", "send_message", "send_media", "read_media", "create_share", "text_to_speech", "memory_search", "memory_get", "curated_memory", "session_search", "automation", "workflow", "delegate_task", "execute_code", "image", "image_generate", "create_desktop_pet", "browser_use", "extensions", "bundle-mcp"];
+export declare const GATEWAY_BUILTIN_TOOL_IDS: readonly ["code_search", "code_read_symbol", "code_trace", "code_impact", "code_architecture", "read_file", "write_file", "apply_patch", "list_dir", "grep", "find", "exec_command", "update_plan", "session_status", "dreaming", "tool_manual", "clarify", "todo", "skills_list", "skill_view", "skill_manage", "skills_marketplace_search", "skill_install", "web_search", "web_fetch", "web_extract", "send_message", "send_media", "read_media", "create_share", "text_to_speech", "memory_search", "memory_get", "session_search", "automation", "workflow", "delegate_task", "execute_code", "image", "image_generate", "create_desktop_pet", "browser_use", "xopc_tool_search", "xopc_tool_describe", "xopc_tool_execute"];
 export type GatewayBuiltinToolId = (typeof GATEWAY_BUILTIN_TOOL_IDS)[number];