npm - @xopcai/xopc - Versions diffs - 0.0.177 → 0.0.178 - Mend

@xopcai/xopc 0.0.177 → 0.0.178

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (112) hide show

package/dist/gateway/static/root/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=20260713-1" />
     <link rel="manifest" href="/site.webmanifest?v=20260713-1" />
     <title>XOPC — Turn goals into loops. Keep what matters moving.</title>
-    <script type="module" crossorigin src="/assets/index-C1h0zkNo.js"></script>
+    <script type="module" crossorigin src="/assets/index-C0CGebQ1.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-aKtaBQYM.js">
     <link rel="modulepreload" crossorigin href="/assets/preload-helper-zJ_50EbN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BOUWij0V.js">
@@ -24,17 +24,17 @@
     <link rel="modulepreload" crossorigin href="/assets/check-DUBLcKHA.js">
     <link rel="modulepreload" crossorigin href="/assets/circle-alert-BEjgurr2.js">
     <link rel="modulepreload" crossorigin href="/assets/middleware-Pd0e8Igk.js">
-    <link rel="modulepreload" crossorigin href="/assets/messages-r8L6Ur3A.js">
-    <link rel="modulepreload" crossorigin href="/assets/locale-store-DVGhFXRz.js">
+    <link rel="modulepreload" crossorigin href="/assets/messages-DP6tPKk-.js">
+    <link rel="modulepreload" crossorigin href="/assets/locale-store-CTwSy7yW.js">
     <link rel="modulepreload" crossorigin href="/assets/cn-JdwAhgNB.js">
     <link rel="modulepreload" crossorigin href="/assets/schemas-DgQq6Z5S.js">
     <link rel="modulepreload" crossorigin href="/assets/product-delivery-BTRT9kCS.js">
     <link rel="modulepreload" crossorigin href="/assets/config-reload-event-Bjh2zoKp.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-to-clipboard-HOJ79TWv.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-WaXTw3fi.js">
-    <link rel="modulepreload" crossorigin href="/assets/activity-store-Wu2ikfbM.js">
-    <link rel="modulepreload" crossorigin href="/assets/theme-store-DQI-HPL-.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-Da36E3WH.css">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-BZEkOdPm.js">
+    <link rel="modulepreload" crossorigin href="/assets/activity-store-BzGX__8I.js">
+    <link rel="modulepreload" crossorigin href="/assets/theme-store-DFLyzoLO.js">
+    <link rel="stylesheet" crossorigin href="/assets/index-eqq25gvV.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/package.js CHANGED Viewed

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.0.177";
+var version = "0.0.178";
 //#endregion
 export { version };

package/dist/src/agent/embedded/model-runtime.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { init_paths, resolveModelsJsonPath } from "../../config/paths.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { XopcModelCredentialStore, init_model_credential_store } from "../../auth/model-credential-store.js";
+import { init_register_bundled_oauth_flows, registerBundledOAuthFlows } from "../../providers/register-bundled-oauth-flows.js";
 import { init_register_runtime_providers, registerRuntimeProviders } from "../../providers/register-runtime-providers.js";
 import { getApiKeySync, init_providers } from "../../providers/index.js";
 import { InMemoryModelsStore } from "@earendil-works/pi-ai";
@@ -12,11 +13,13 @@ init_model_credential_store();
 init_sync_provider_auth();
 init_paths();
 init_providers();
+init_register_bundled_oauth_flows();
 init_register_runtime_providers();
 function resolveEmbeddedProviderApiKeySync(providerId) {
 	return resolveProviderApiKeySync(providerId) ?? getApiKeySync(providerId);
 }
 async function createEmbeddedModelRuntime(providerId) {
+	registerBundledOAuthFlows();
 	const resolver = new CredentialResolver();
 	const credentials = new XopcModelCredentialStore(resolver);
 	const modelRuntime = await ModelRuntime.create({

package/dist/src/agent/embedded/run-for-session.js CHANGED Viewed

@@ -91,13 +91,15 @@ async function runEmbeddedTurnForSession(params) {
 			}, "Agent model fallback candidates resolved");
 			let lastResult;
 			let lastError;
+			let resumeLastUserMessage = false;
 			const primaryModelRef = modelRef;
-			const beforeLen = Array.isArray(agent.state?.messages) ? agent.state.messages.length : void 0;
 			for (let i = 0; i < resolvedCandidates.length; i++) {
 				const candidate = resolvedCandidates[i];
 				const candidateModelRef = candidate.ref;
 				const isFallbackAttempt = i > 0;
 				const candidateModel = candidate.model;
+				const hasNextCandidate = i + 1 < resolvedCandidates.length;
+				const rowsBeforeAttempt = hasNextCandidate ? await sessionStore.loadTranscriptRows(sessionKey) : void 0;
 				if (typeof mm.applyResolvedModel === "function") mm.applyResolvedModel(agent, candidateModel, candidateModelRef);
 				agentManager.setModelForSession(sessionKey, candidateModelRef);
 				if (isFallbackAttempt) log.info({
@@ -123,7 +125,8 @@ async function runEmbeddedTurnForSession(params) {
 						sessionStore,
 						timeoutMs: resolveAgentTurnTimeoutMs(config),
 						abortSignal: params.abortSignal,
-						onEvent: params.onEvent
+						onEvent: params.onEvent,
+						resumeLastUserMessage
 					});
 					if (turnResult.ok) {
 						if (isFallbackAttempt) log.info({
@@ -137,7 +140,6 @@ async function runEmbeddedTurnForSession(params) {
 						return turnResult;
 					}
 					lastResult = turnResult;
-					const hasNextCandidate = i + 1 < resolvedCandidates.length;
 					log.warn({
 						sessionKey,
 						runId,
@@ -150,7 +152,6 @@ async function runEmbeddedTurnForSession(params) {
 				} catch (err) {
 					lastError = err;
 					if (err instanceof DOMException && err.name === "AbortError") throw err;
-					const hasNextCandidate = i + 1 < resolvedCandidates.length;
 					log.warn({
 						err,
 						sessionKey,
@@ -161,7 +162,19 @@ async function runEmbeddedTurnForSession(params) {
 						hasNextCandidate
 					}, hasNextCandidate ? "Agent model call threw, trying fallback" : "Agent model call threw, no fallback remains");
 				}
-				if (beforeLen !== void 0 && Array.isArray(agent.state?.messages)) agent.state.messages = agent.state.messages.slice(0, beforeLen);
+				if (hasNextCandidate && rowsBeforeAttempt) {
+					const preparation = await sessionStore.prepareModelFallback(sessionKey, rowsBeforeAttempt);
+					if (preparation === "unsafe") {
+						log.warn({
+							sessionKey,
+							runId,
+							modelRef: candidateModelRef,
+							attempt: i + 1
+						}, "Agent model fallback skipped because the failed attempt changed the transcript");
+						break;
+					}
+					resumeLastUserMessage = preparation === "resume";
+				}
 			}
 			if (lastResult) return lastResult;
 			if (lastError instanceof Error) throw lastError;

package/dist/src/agent/embedded/run-turn.js CHANGED Viewed

@@ -206,9 +206,12 @@ async function runXopcEmbeddedTurn(params) {
 		}
 		try {
 			await runAgentTurnWithTimeout(session.agent, async () => {
-				const text = userMessageToPromptText(userMessage);
-				const images = params.images ?? [];
-				await session.prompt(text, images.length > 0 ? { images } : void 0);
+				if (params.resumeLastUserMessage) await session.agent.continue();
+				else {
+					const text = userMessageToPromptText(userMessage);
+					const images = params.images ?? [];
+					await session.prompt(text, images.length > 0 ? { images } : void 0);
+				}
 				await session.agent.waitForIdle();
 				await maybeRetryTurnAfterTransientLlmFailure(session.agent, {
 					sessionKey,

package/dist/src/agent/embedded/types.d.ts CHANGED Viewed

@@ -89,6 +89,8 @@ export type RunXopcEmbeddedTurnParams = {
     abortSignal?: AbortSignal;
     onEvent?: (event: EmbeddedStreamEvent) => void;
     images?: ImageContent[];
+    /** Continue from the persisted trailing user row instead of appending it again. */
+    resumeLastUserMessage?: boolean;
 };
 export type RunXopcEmbeddedTurnResult = {
     ok: boolean;

package/dist/src/config/agent-profile.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { init_agent_scope, normalizeAgentId, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
 import { resolveEffectiveAgentManifest } from "../agent-manifest/resolver.js";
 import "../agent-manifest/index.js";
-import { init_agent_scope, normalizeAgentId, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
 import { init_session_key, parseSessionKey } from "../routing/session-key.js";
 import { agentExists, getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 //#region src/config/agent-profile.ts

package/dist/src/connectors/composio-sessions.js CHANGED Viewed

@@ -76,7 +76,7 @@ var ComposioSessionsAdapter = class {
 			try {
 				[{Composio}, {PiProvider}] = await Promise.all([import("@composio/core"), import("@composio/experimental")]);
 			} catch (cause) {
-				throw new Error("Composio support requires @composio/core and @composio/experimental. Install them alongside @xopcai/xopc; use npm install -g when xopc is installed globally.", { cause });
+				throw new Error("The xopc installation is missing the bundled Composio runtime. Reinstall @xopcai/xopc and restart the gateway.", { cause });
 			}
 			return new Composio({
 				apiKey,

package/dist/src/gateway/agents-admin.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { resolveEffectiveAgentManifest } from "../agent-manifest/resolver.js";
 import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveAgentDir, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath, validateAgentIdForNewAgent } from "../agent/agent-scope.js";
+import { resolveEffectiveAgentManifest } from "../agent-manifest/resolver.js";
 import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
 import { WORKSPACE_FILES, init_paths, resolveUserProfilePath } from "../config/paths.js";
 import { AGENT_PROFILE_MARKDOWN_SYSTEM_FILES, REQUIRED_AGENT_PROFILE_MARKDOWN_FILE_SET } from "../agent/context/workspace.js";

package/dist/src/gateway/heartbeat/service.js CHANGED Viewed

@@ -1,9 +1,9 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { shouldSilence, stripHeartbeatToken } from "../../heartbeat/tokens.js";
-import { appendCronEventLines } from "../../heartbeat/event-prompt.js";
 import { isWithinActiveHours } from "../../heartbeat/active-hours.js";
 import { isHeartbeatContentEmpty } from "../../heartbeat/content-check.js";
+import { appendCronEventLines } from "../../heartbeat/event-prompt.js";
 import { createHeartbeatWake } from "../../heartbeat/wake.js";
 import { resolveHeartbeatMdPath } from "../workspace-heartbeat-path.js";
 import { readFile } from "fs/promises";

package/dist/src/gateway/hono/routes/browser-install.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { createGatewayRouteLogger } from "../lib/route-logger.js";
 import { acquireBrowserInstallLock, cancelBrowserInstall } from "../../../browser/install-lock.js";
+import { createGatewayRouteLogger } from "../lib/route-logger.js";
 import { runPlaywrightChromiumInstallWithProgress } from "../../../browser/providers/playwright-install.js";
 import { streamSSE } from "hono/streaming";
 //#region src/gateway/hono/routes/browser-install.ts

package/dist/src/heartbeat/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { DEFAULT_ACK_MAX_CHARS, HEARTBEAT_OK, NO_REPLY, shouldSilence, stripHeartbeatToken } from "./tokens.js";
-import { appendCronEventLines } from "./event-prompt.js";
 import { isWithinActiveHours } from "./active-hours.js";
 import { isHeartbeatContentEmpty } from "./content-check.js";
+import { appendCronEventLines } from "./event-prompt.js";
 import { createHeartbeatWake } from "./wake.js";
 export { DEFAULT_ACK_MAX_CHARS, HEARTBEAT_OK, NO_REPLY, appendCronEventLines, createHeartbeatWake, isHeartbeatContentEmpty, isWithinActiveHours, shouldSilence, stripHeartbeatToken };

package/dist/src/providers/provider-auth-service.js CHANGED Viewed

@@ -2,11 +2,13 @@ import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { init_paths, resolveModelsJsonPath } from "../config/paths.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { XopcModelCredentialStore, init_model_credential_store } from "../auth/model-credential-store.js";
+import { init_register_bundled_oauth_flows, registerBundledOAuthFlows } from "./register-bundled-oauth-flows.js";
 import { init_register_runtime_providers, registerRuntimeProviders } from "./register-runtime-providers.js";
 import { InMemoryModelsStore } from "@earendil-works/pi-ai";
 import { ModelRuntime } from "@earendil-works/pi-coding-agent";
 //#region src/providers/provider-auth-service.ts
 async function createAuthRuntime(credentials) {
+	registerBundledOAuthFlows();
 	const runtime = await ModelRuntime.create({
 		credentials,
 		modelsPath: resolveModelsJsonPath(),
@@ -32,6 +34,7 @@ var init_provider_auth_service = __esmMin((() => {
 	init_credentials();
 	init_model_credential_store();
 	init_paths();
+	init_register_bundled_oauth_flows();
 	init_register_runtime_providers();
 	ProviderAuthService = class {
 		credentials;

package/dist/src/providers/register-bundled-oauth-flows.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ /** Statically include pi-ai OAuth flows for single-file runtimes such as Electron. */
2	+ export declare function registerBundledOAuthFlows(): void;

package/dist/src/providers/register-bundled-oauth-flows.js ADDED Viewed

@@ -0,0 +1,16 @@
+import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
+import { registerBunOAuthFlows } from "@earendil-works/pi-ai/bun-oauth";
+//#region src/providers/register-bundled-oauth-flows.ts
+/** Statically include pi-ai OAuth flows for single-file runtimes such as Electron. */
+function registerBundledOAuthFlows() {
+	if (registered) return;
+	registerBunOAuthFlows();
+	registered = true;
+}
+var registered;
+var init_register_bundled_oauth_flows = __esmMin((() => {
+	registered = false;
+}));
+//#endregion
+init_register_bundled_oauth_flows();
+export { init_register_bundled_oauth_flows, registerBundledOAuthFlows };

package/dist/src/session/store.d.ts CHANGED Viewed

@@ -26,6 +26,7 @@ export interface SessionCompactionHooks {
         compactedCount: number;
     }) => Promise<void> | void;
 }
+export type ModelFallbackPreparation = 'prompt' | 'resume' | 'unsafe';
 export declare class SessionStore {
     private options;
     private window;
@@ -78,6 +79,7 @@ export declare class SessionStore {
     private buildSessionDetail;
     loadTranscriptRows(key: string): Promise<TranscriptStoredRow[]>;
     loadTranscriptHistoryRows(key: string): Promise<TranscriptStoredRow[]>;
+    prepareModelFallback(key: string, rowsBeforeAttempt: readonly TranscriptStoredRow[]): Promise<ModelFallbackPreparation>;
     getMetadata(key: string): Promise<SessionMetadata | null>;
     resolveKeyBySessionId(sessionId: string): Promise<string | null>;
     updateMetadata(key: string, updates: Partial<SessionMetadata>): Promise<void>;

package/dist/src/session/store.js CHANGED Viewed

@@ -21,6 +21,16 @@ init_paths_state();
 init_logger();
 const log = createLogger("SessionStore");
 const INDEX_VERSION = "1.0";
+function isTranscriptMessageRole(row, role) {
+	return !!row && typeof row === "object" && "role" in row && row.role === role;
+}
+function isErrorAssistantRow(row) {
+	return isTranscriptMessageRole(row, "assistant") && row.stopReason === "error";
+}
+function transcriptPrefixMatches(expected, current) {
+	if (current.length < expected.length) return false;
+	return expected.every((row, index) => JSON.stringify(row) === JSON.stringify(current[index]));
+}
 var SessionStore = class {
 	window;
 	compactor;
@@ -186,6 +196,26 @@ var SessionStore = class {
 		requireXopcDatabase();
 		return loadTranscriptHistoryRowsForSession(key);
 	}
+	async prepareModelFallback(key, rowsBeforeAttempt) {
+		return this.runStoreMutation(async () => {
+			requireXopcDatabase();
+			const currentRows = loadTranscriptRowsForSession(key);
+			if (!transcriptPrefixMatches(rowsBeforeAttempt, currentRows)) return "unsafe";
+			let preparedRows = currentRows;
+			let removedError = false;
+			if (isErrorAssistantRow(preparedRows.at(-1))) {
+				preparedRows = preparedRows.slice(0, -1);
+				removedError = true;
+			}
+			const appendedRows = preparedRows.slice(rowsBeforeAttempt.length);
+			if (appendedRows.length === 1 && isTranscriptMessageRole(appendedRows[0], "user") || removedError && appendedRows.length === 0 && isTranscriptMessageRole(preparedRows.at(-1), "user")) {
+				if (removedError) replaceTranscriptRows(key, preparedRows);
+				return "resume";
+			}
+			if (!removedError && appendedRows.length === 0) return "prompt";
+			return "unsafe";
+		});
+	}
 	async getMetadata(key) {
 		requireXopcDatabase();
 		return getSessionMetadata(key);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@xopcai/xopc",
-  "version": "0.0.177",
+  "version": "0.0.178",
   "description": "Local-first AI system that remembers context, coordinates AI, and sustains long-term progress.",
   "type": "module",
   "main": "dist/src/index.js",
@@ -65,6 +65,8 @@
     "node": ">=22.19.0"
   },
   "dependencies": {
+    "@composio/core": "0.14.1",
+    "@composio/experimental": "0.2.0",
     "@earendil-works/pi-agent-core": "0.84.1",
     "@earendil-works/pi-ai": "0.84.1",
     "@earendil-works/pi-coding-agent": "0.84.1",
@@ -106,20 +108,12 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@composio/core": "0.14.1",
-    "@composio/experimental": "0.2.0",
     "@huggingface/transformers": "3.8.1",
     "@larksuiteoapi/node-sdk": "^1.66.0",
     "playwright-core": "^1.60.0",
     "sherpa-onnx-node": "1.13.4"
   },
   "peerDependenciesMeta": {
-    "@composio/core": {
-      "optional": true
-    },
-    "@composio/experimental": {
-      "optional": true
-    },
     "@huggingface/transformers": {
       "optional": true
     },
@@ -134,8 +128,6 @@
     }
   },
   "devDependencies": {
-    "@composio/core": "0.14.1",
-    "@composio/experimental": "0.2.0",
     "@huggingface/transformers": "3.8.1",
     "@larksuiteoapi/node-sdk": "^1.66.0",
     "@resvg/resvg-js": "^2.6.2",

package/dist/gateway/static/root/assets/channels-status-swr-D3xr2enH.js DELETED Viewed

	@@ -1 +0,0 @@
1	- import{r as e}from"./locale-store-DVGhFXRz.js";import{n as t}from"./channel-recipient-api-B4sha-30.js";function n(){return e(`/api/channels/status`)}var r=t;export{r as n,n as t};