pi2dsh 0.10.0 → 0.11.0

package/dist/{runtime-Ce3PTbWU.mjs → runtime-DFD6u4NO.mjs}

@@ -303,9 +303,22 @@ var PiSessionBridge = class {
 //#endregion
 //#region src/subagent-bridge.ts
 let subagentSerial = 0;
+/** Flatten a Pi message's content to text for transcript seeding. */
+function piMessageText(message) {
+	const content = message.content;
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	return content.map((block) => {
+		const record = block;
+		if (record?.type === "text" && typeof record.text === "string") return record.text;
+		if (record?.type === "toolCall" && typeof record.name === "string") return `(tool ${record.name})`;
+		return "";
+	}).filter((text) => text.length > 0).join("\n");
+}
 var PiBridgedAgentSession = class {
 	agent = {};
 	messages = [];
+	#seed = [];
 	#host;
 	#handle;
 	#session;
@@ -313,6 +326,10 @@ var PiBridgedAgentSession = class {
 	#subscribers = /* @__PURE__ */ new Set();
 	#disposers = [];
 	#activeToolNames;
+	#state;
+	#model;
+	#streaming = false;
+	#pendingToolCalls = /* @__PURE__ */ new Set();
 	#sessionName = "";
 	#turns = 0;
 	#aborted = false;
@@ -341,6 +358,51 @@ var PiBridgedAgentSession = class {
 			return next();
 		});
 		this.#disposers.push(offEvents, offPre);
+		const session = this;
+		this.#state = {
+			get systemPrompt() {
+				return "";
+			},
+			get model() {
+				return session.#model;
+			},
+			get thinkingLevel() {
+				return "off";
+			},
+			get tools() {
+				return [...session.#tools];
+			},
+			set tools(_next) {},
+			get messages() {
+				return [...session.messages];
+			},
+			set messages(next) {
+				session.#assignTranscript(next);
+			},
+			get isStreaming() {
+				return session.#streaming;
+			},
+			get pendingToolCalls() {
+				return new Set(session.#pendingToolCalls);
+			}
+		};
+		this.agent.state = this.#state;
+	}
+	/** Pi's AgentState projection, shared by `session.state` and `session.agent.state`. */
+	get state() {
+		return this.#state;
+	}
+	/**
+	* Pi's `state.messages = …` assignment. Messages already present in this
+	* child's projection stay as they are (they are durable); anything new is
+	* queued and delivered with the next prompt so the child model really sees
+	* the transcript the package seeded.
+	*/
+	#assignTranscript(next) {
+		const identity = (message) => JSON.stringify([message.role, message.content]);
+		const known = new Set(this.messages.map(identity));
+		this.#seed = next.filter((message) => !known.has(identity(message)));
+		for (const message of this.#seed) this.messages.push(message);
 	}
 	#project(event) {
 		const type = event.type;
@@ -349,12 +411,27 @@ var PiBridgedAgentSession = class {
 				handler(piEvent);
 			} catch {}
 		};
-		if (type === "turn/start") emit({
-			type: "turn_start",
-			turnIndex: Number(event.data.turn ?? 1) - 1
-		});
+		if (type === "turn/start") {
+			this.#streaming = true;
+			emit({
+				type: "turn_start",
+				turnIndex: Number(event.data.turn ?? 1) - 1
+			});
+		}
+		if (type === "request/header") {
+			const config = event.data.config ?? {};
+			if (typeof config.model === "string") this.#model = {
+				id: config.model,
+				provider: String(config.provider ?? "")
+			};
+		}
+		if (type === "tools/result" || type === "tool/result") {
+			const data = event.data;
+			this.#pendingToolCalls.delete(String(data.callId ?? ""));
+		}
 		if (type === "tool/call") {
 			const data = event.data;
+			this.#pendingToolCalls.add(String(data.callId ?? ""));
 			let args = {};
 			try {
 				args = JSON.parse(String(data.arguments ?? "{}"));
@@ -401,6 +478,8 @@ var PiBridgedAgentSession = class {
 		}
 		if (type === "turn/end") {
 			this.#turns += 1;
+			this.#streaming = false;
+			this.#pendingToolCalls.clear();
 			emit({
 				type: "turn_end",
 				turnIndex: Number(event.data.turn ?? 1) - 1,
@@ -417,6 +496,28 @@ var PiBridgedAgentSession = class {
 		return () => this.#subscribers.delete(handler);
 	}
 	async prompt(text) {
+		if (this.#seed.length > 0) {
+			const seeded = this.#seed;
+			this.#seed = [];
+			const rendered = seeded.map((message) => {
+				const role = String(message.role ?? "user");
+				const content = piMessageText(message);
+				return content.length === 0 ? void 0 : `[${role}]: ${content}`;
+			}).filter((line) => line !== void 0);
+			if (rendered.length > 0) {
+				const seedBlocks = await this.#host.piContentToDsh([{
+					type: "text",
+					text: `<prior-conversation>\n${rendered.join("\n\n")}\n</prior-conversation>`
+				}]);
+				this.#host.deliver(this.#handle.agent, createUserMessage({
+					content: seedBlocks,
+					source: {
+						kind: "plugin",
+						plugin: this.#host.messageSource
+					}
+				}), "inject");
+			}
+		}
 		const blocks = await this.#host.piContentToDsh([{
 			type: "text",
 			text: String(text)
@@ -496,6 +597,18 @@ var PiBridgedAgentSession = class {
 		await this.#handle.dispose();
 	}
 };
+/**
+* The name DSH's own child catalog shows for a side thread. Pi packages rarely
+* label a child, so the package that started it is the honest fallback: with
+* several Pi packages installed, their threads stay apart in one list.
+* @param requested - a label the calling package supplied, if any.
+* @param packageName - the Pi package the call came from.
+*/
+function childLabel(requested, packageName) {
+	if (typeof requested === "string" && requested.trim().length > 0) return requested.trim().slice(0, 80);
+	const owner = packageName?.trim();
+	return owner === void 0 || owner.length === 0 ? "Pi side conversation" : `${owner} side conversation`;
+}
 async function createBridgedAgentSession(host, options) {
 	const agents = host.cordis.get("agents");
 	if (agents?.create === void 0) throw new Error("pi2dsh: createAgentSession() needs the DSH agent registry in the host composition");
@@ -536,6 +649,17 @@ async function createBridgedAgentSession(host, options) {
 		throw new Error(`pi2dsh: subagent creation needs the DSH host loop (model runtime) to provide the agent factory; this composition cannot run one (${error instanceof Error ? error.message : String(error)})`);
 	}
 	const tools = [...Array.isArray(options.tools) ? options.tools : [], ...Array.isArray(options.customTools) ? options.customTools : []];
+	const childSession = handle.agent.session;
+	if (typeof childSession?.append === "function") try {
+		childSession.append("subagent/descriptor", {
+			version: 2,
+			mode: "continuable",
+			provider: "pi2dsh",
+			label: childLabel(options.label, host.packageName)
+		});
+	} catch (error) {
+		host.cordis.logger?.warn?.(`[pi2dsh] child session could not record its subagent identity: ${error instanceof Error ? error.message : String(error)}`);
+	}
 	return { session: new PiBridgedAgentSession(host, handle, tools) };
 }
 //#endregion
@@ -2908,7 +3032,7 @@ function registerCommand(ctx, state, command) {
 	const definitionFor = (dshName) => ({
 		name: dshName,
 		description: command.description || `Migrated Pi command /${command.name}`,
-		...command.argumentHint !== void 0 ? { input: { hint: command.argumentHint } } : {},
+		input: { hint: command.argumentHint ?? "arguments (optional)" },
 		async handler(invocation) {
 			const agent = invocation.agent;
 			const commandContext = contextFor(ctx, state, agent, invocation.signal, true);
@@ -3368,7 +3492,8 @@ async function applyPiPackage(ctx, options) {
 		piContentToDsh: (content) => piToDshContent(ctx, content),
 		deliver: (agent, message, mode) => deliverAgentMessage(agent, message, mode),
 		messageFromSessionEvent,
-		messageSource: state.messageSource
+		messageSource: state.messageSource,
+		packageName: state.packageName
 	}, subagentOptions));
 	ctx.effect(() => () => __setSubagentSessionFactory(void 0));
 	await registerPromptCommands(ctx, state, rootDir, options.manifest);
@@ -3410,4 +3535,4 @@ const runtimeInternals = {
 //#endregion
 export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-Ce3PTbWU.mjs.map
+//# sourceMappingURL=runtime-DFD6u4NO.mjs.map