pi-ptc-subagents 6.0.1 → 6.0.2

package/dist/index.js

@@ -4890,7 +4890,9 @@ function createPtcRunCodeTool(options) {
 		description: TOOLS$1.ptc_run_code.description(options.surface ?? "full_ptc"),
 		parameters: RUN_CODE_PARAMETERS,
 		renderResult: renderPtcResult("run_code"),
-		execute: async (_id, args, _signal, _onUpdate, ctx) => {
+		execute: async (...rawArgs) => {
+			const args = rawArgs[1];
+			const ctx = rawArgs.find((value) => typeof value?.executeTool === "function");
 			options.onToolContext?.(ctx);
 			const outcome = await runPtcProgram({
 				code: args.code,
@@ -4937,7 +4939,9 @@ function createPtcWorkflowTool(options) {
 		description: TOOLS$1.ptc_workflow.description(options.surface ?? "full_ptc"),
 		parameters: WORKFLOW_PARAMETERS,
 		renderResult: renderPtcResult("workflow"),
-		execute: async (_id, params, _signal, _onUpdate, ctx) => {
+		execute: async (...rawArgs) => {
+			const params = rawArgs[1];
+			const ctx = rawArgs.find((value) => typeof value?.executeTool === "function");
 			options.onToolContext?.(ctx);
 			try {
 				validateWorkflowArgs(params.args);
@@ -5342,9 +5346,9 @@ function piPtcEntry(pi) {
 		registerTaskFace(registerTracked, session, surface);
 		applyTaskFaceVisibility(pi, session);
 		let toolContext;
-		const bindings = createBindingTable(pi, session, () => toolContext);
+		const getBindings = () => createBindingTable(pi, session, () => toolContext);
 		registerPtcTools(registerTracked, {
-			getBindings: () => bindings,
+			getBindings,
 			cwd: process.cwd(),
 			surface,
 			getPool: () => pool,
@@ -5450,18 +5454,30 @@ function registerChildToolsOnly(pi) {
 		})
 	});
 }
+function normalizeToolValue(value) {
+	if (typeof value === "string") return value;
+	if (Array.isArray(value)) return value.map((block) => typeof block === "string" ? block : block?.text ?? JSON.stringify(block)).join("\n");
+	if (value && typeof value === "object") {
+		const obj = value;
+		if (typeof obj.content === "string") return obj.content;
+		if (typeof obj.text === "string") return obj.text;
+	}
+	return value;
+}
 function createBindingTable(pi, session, getToolContext) {
-	const names = resolveBindingNames(pi.getActiveTools());
+	const active = pi.getActiveTools();
+	const known = new Set(KNOWN_BINDING_NAMES);
+	const names = resolveBindingNames(active.some((name) => known.has(name)) ? active : pi.getAllTools().map((tool) => tool.name));
 	const table = Object.fromEntries(names.map((name) => [name, async (args, callCtx) => {
 		const ctx = getToolContext();
-		if (!ctx?.executeTool) throw new Error(`此 pi 版本不支持程序内工具调用（executeTool 不可用，binding: ${name}）`);
+		if (!ctx?.executeTool) throw new Error(`此 pi 版本没有程序内调用工具的通道（需 pi ≥ 0.99，binding: ${name}）`);
 		const outcome = await ctx.executeTool(name, args, { signal: callCtx.signal });
 		for (const block of outcome.result.content) if (block.type === "image") callCtx.emitImage(block);
 		if (outcome.isError) {
 			const text = outcome.result.content.map((block) => block.type === "text" ? block.text : `[${block.type}]`).join("\n");
 			throw new Error(text || `工具 ${name} 执行失败`);
 		}
-		return outcome.result.structuredContent ?? outcome.result.content;
+		return normalizeToolValue(outcome.result.structuredContent ?? outcome.result.content);
 	}]));
 	const taskBinding = createTaskBinding(session);
 	table[TASK_BINDING_NAME] = (args) => taskBinding.execute(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ptc-subagents",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Programmable tool calling (PTC) and subagent fan-out for pi",
   "keywords": [
     "pi",