pagegraph 0.8.1 → 0.8.3

package/dist/cli.js

@@ -35710,7 +35710,7 @@ const runWith = (command, config) => {
 };
 //#endregion
 //#region package.json
-var version = "0.8.1";
+var version = "0.8.3";
 //#endregion
 //#region src/core/projections.ts
 const escapeXml = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
@@ -43433,7 +43433,7 @@ const TranscriptSchema = Struct({ messages: ArraySchema(Unknown) });
 const decodeTextPart = decodeUnknownOption(TextPartSchema);
 const decodeAssistantMessage = decodeUnknownOption(AssistantMessageSchema);
 const decodeTranscript = decodeUnknownSync(TranscriptSchema);
-const parseState = (transcript) => {
+const parseWorkflowState = (transcript) => {
 	const candidates = decodeTranscript(transcript).messages.flatMap((message) => {
 		const assistant = decodeAssistantMessage(message);
 		if (isNone(assistant)) return [];
@@ -43452,6 +43452,25 @@ const parseState = (transcript) => {
 	}
 	throw new Error("The SEO agent did not return a valid workflow JSON object.");
 };
+const parseWorkflowStateWithRepair = async (transcript, repair) => {
+	try {
+		return {
+			state: parseWorkflowState(transcript),
+			transcript
+		};
+	} catch {
+		const repaired = await repair();
+		return {
+			state: parseWorkflowState(repaired),
+			transcript: repaired
+		};
+	}
+};
+const STATE_REPAIR_PROMPT = [
+	"Your previous turn did not end with the workflow JSON object requested by the original prompt.",
+	"Do not call tools, add commentary, or wrap the response in Markdown.",
+	"Return only one valid JSON object matching the original JSON Schema, using the evidence already collected."
+].join(" ");
 const decodeToolPart = decodeUnknownOption(Struct({
 	type: Literal("tool"),
 	id: String$6,
@@ -43479,6 +43498,31 @@ const toolText = (value) => {
 	return Object.values(record).map(toolText).join("\n");
 };
 const pathsIn = (value) => [...toolText(value).matchAll(/tools\.([A-Za-z0-9_.-]+)/g)].map((match) => match[1] ?? "").filter(Boolean);
+const toolPathPattern = /^[A-Za-z0-9_-]+(?:\.[A-Za-z0-9_-]+)+$/;
+const pathsInSearchOutput = (value) => {
+	const found = /* @__PURE__ */ new Set();
+	const visit = (current, pathField = false) => {
+		if (typeof current === "string") {
+			if (pathField) {
+				const candidate = current.startsWith("tools.") ? current.slice(6) : current;
+				if (toolPathPattern.test(candidate)) found.add(candidate);
+			}
+			try {
+				visit(JSON.parse(current));
+			} catch {}
+			return;
+		}
+		if (Array.isArray(current)) {
+			for (const item of current) visit(item);
+			return;
+		}
+		if (current === null || typeof current !== "object") return;
+		const record = current;
+		for (const [key, nested] of Object.entries(record)) visit(nested, key === "path");
+	};
+	visit(value);
+	return [...found];
+};
 const evidenceRecord = (part) => ({
 	tool: part.name,
 	input: part.state.input ?? null,
@@ -43492,7 +43536,7 @@ const collectExecutorEvidence = (transcript) => {
 		const inputPaths = pathsIn(part.state.input);
 		const inputText = toolText(part.state.input);
 		if (part.name === "executor_search" || part.name === "executor.search" || inputPaths.some((path) => path === "executor.search")) {
-			for (const path of pathsIn(part.state.content)) if (path !== "executor.search") discovered.add(path);
+			for (const path of pathsInSearchOutput(part.state.content)) if (path !== "executor.search") discovered.add(path);
 			searches.push(evidenceRecord(part));
 			continue;
 		}
@@ -43515,14 +43559,14 @@ const interactionEventError = (event, sessionId) => {
 		if (form !== null && typeof form === "object" && form["sessionID"] === sessionId) return /* @__PURE__ */ new Error("OpenCode requested a form; embedded PageGraph workflows are noninteractive.");
 	}
 };
-const waitForIdle = async (host, sessionId, timeoutMs, after) => {
+const waitForIdle = async (host, sessionId, options) => {
 	const controller = new AbortController();
-	const timer = setTimeout(() => controller.abort(), timeoutMs);
+	const timer = setTimeout(() => controller.abort(), options.timeoutMs);
 	try {
 		for await (const event of host.sessions.log({
 			sessionID: sessionId,
 			follow: true,
-			after
+			after: options.after
 		}, { signal: controller.signal })) {
 			const interactionError = interactionEventError(event, sessionId);
 			if (interactionError !== void 0) throw interactionError;
@@ -43530,6 +43574,9 @@ const waitForIdle = async (host, sessionId, timeoutMs, after) => {
 			if (event.type === "session.execution.failed" && event.data.sessionID === sessionId) throw new Error(`OpenCode session failed: ${JSON.stringify(event.data.error)}`);
 			if (event.type === "session.execution.interrupted" && event.data.sessionID === sessionId) throw new Error(`OpenCode session was interrupted: ${event.data.reason}.`);
 		}
+	} catch (cause) {
+		if (controller.signal.aborted) throw new Error(`OpenCode session did not complete within ${options.configuredTimeoutMs ?? options.timeoutMs}ms.`, { cause });
+		throw cause;
 	} finally {
 		clearTimeout(timer);
 	}
@@ -43556,22 +43603,62 @@ const acquireWorkflowHost = async (options) => {
 				sessionID: sessionId,
 				permissions: [...workflowOptions.permissions]
 			});
+			const configuredTimeoutMs = options.timeoutMs ?? 18e4;
+			const deadline = Date.now() + configuredTimeoutMs;
+			const remaining = () => Math.max(0, deadline - Date.now());
 			await host.sessions.prompt({
 				sessionID: sessionId,
 				text: prompt,
 				skills: workflowOptions.skills.map((id) => ({ id }))
 			});
-			const cursor = await waitForIdle(host, sessionId, options.timeoutMs ?? 18e4, cursors.get(sessionId));
+			let cursor = await waitForIdle(host, sessionId, {
+				timeoutMs: remaining(),
+				configuredTimeoutMs,
+				after: cursors.get(sessionId)
+			});
 			cursors.set(sessionId, cursor);
-			const transcript = await host.sessions.export({
+			let transcript = await host.sessions.export({
 				sessionID: sessionId,
 				sanitize: false
 			});
+			const parsed = await parseWorkflowStateWithRepair(transcript, async () => {
+				const priorPermissions = [...workflowOptions.permissions ?? []];
+				await host.sessions.update({
+					sessionID: sessionId,
+					permissions: [{
+						action: "*",
+						resource: "*",
+						effect: "deny"
+					}]
+				});
+				try {
+					await host.sessions.prompt({
+						sessionID: sessionId,
+						text: STATE_REPAIR_PROMPT
+					});
+					cursor = await waitForIdle(host, sessionId, {
+						timeoutMs: remaining(),
+						configuredTimeoutMs,
+						after: cursor
+					});
+					cursors.set(sessionId, cursor);
+					transcript = await host.sessions.export({
+						sessionID: sessionId,
+						sanitize: false
+					});
+					return transcript;
+				} finally {
+					await host.sessions.update({
+						sessionID: sessionId,
+						permissions: priorPermissions
+					});
+				}
+			});
 			return {
-				state: parseState(transcript),
+				state: parsed.state,
 				sessionId,
-				transcript,
-				executor: collectExecutorEvidence(transcript)
+				transcript: parsed.transcript,
+				executor: collectExecutorEvidence(parsed.transcript)
 			};
 		};
 		return {
@@ -43588,7 +43675,7 @@ const acquireWorkflowHost = async (options) => {
 					permissions: workflowOptions.permissions === void 0 ? void 0 : [...workflowOptions.permissions]
 				});
 				const result = await complete(session.id, prompt, workflowOptions);
-				if (result.executor.searches.length === 0 || result.executor.calls.length === 0) throw new Error("The SEO agent returned without searching Executor and calling a discovered tool.");
+				if (result.executor.searches.length === 0 || result.executor.calls.length === 0) throw new Error(`The SEO agent returned without the required Executor evidence (searches: ${result.executor.searches.length}, calls: ${result.executor.calls.length}).`);
 				return result;
 			},
 			continue: (sessionId, prompt, workflowOptions) => complete(sessionId, prompt, workflowOptions),