@nextclaw/service 0.1.7 → 0.1.8

package/dist/shared/services/ui/companion-runtime.service.js

@@ -1,13 +1,22 @@
 import { isProcessRunning } from "../../utils/cli.utils.js";
-import { companionRuntimeStore } from "../../stores/companion-runtime.store.js";
 import { localUiDiscoveryService } from "./local-ui-discovery.service.js";
+import { companionRuntimeStore } from "../../stores/companion-runtime.store.js";
 import { createRequire } from "node:module";
-import { spawn } from "node:child_process";
-import { dirname, resolve } from "node:path";
 import { APP_NAME, getConfigPath, loadConfig, saveConfig } from "@nextclaw/core";
 import { existsSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { spawn } from "node:child_process";
 //#region src/shared/services/ui/companion-runtime.service.ts
 const require = createRequire(import.meta.url);
+var CompanionUnavailableError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "CompanionUnavailableError";
+	}
+};
+function isCompanionUnavailableError(error) {
+	return error instanceof CompanionUnavailableError;
+}
 var CompanionRuntimeService = class {
 	constructor(runtimeStore = companionRuntimeStore, uiDiscoveryService = localUiDiscoveryService) {
 		this.runtimeStore = runtimeStore;
@@ -25,12 +34,21 @@ var CompanionRuntimeService = class {
 	resolveDiscoveredBaseUrl = () => {
 		return this.uiDiscoveryService.resolveApiBase();
 	};
+	isAvailable = () => {
+		try {
+			this.resolveLaunchSpec();
+			return true;
+		} catch (error) {
+			if (isCompanionUnavailableError(error)) return false;
+			throw error;
+		}
+	};
 	applyConfig = async (config) => {
 		if (!config.companion.enabled) {
 			await this.ensureStopped();
 			return;
 		}
-		await this.ensureStarted({ baseUrl: this.uiDiscoveryService.resolveLocalOrigin(config) });
+		await this.ensureStartedIfAvailable({ baseUrl: this.uiDiscoveryService.resolveLocalOrigin(config) });
 	};
 	updateEnabled = async (enabled, options = {}) => {
 		const config = loadConfig(getConfigPath());
@@ -45,11 +63,11 @@ var CompanionRuntimeService = class {
 		if (enabled) {
 			const explicitBaseUrl = options.baseUrl?.trim();
 			if (explicitBaseUrl) {
-				await this.ensureStarted({ baseUrl: explicitBaseUrl });
+				await this.ensureStartedIfAvailable({ baseUrl: explicitBaseUrl });
 				return next;
 			}
 			const discoveredBaseUrl = this.uiDiscoveryService.resolveApiBase();
-			if (discoveredBaseUrl) await this.ensureStarted({ baseUrl: discoveredBaseUrl });
+			if (discoveredBaseUrl) await this.ensureStartedIfAvailable({ baseUrl: discoveredBaseUrl });
 			return next;
 		}
 		await this.ensureStopped();
@@ -120,11 +138,25 @@ var CompanionRuntimeService = class {
 	killProcess = (pid, force) => {
 		process.kill(pid, force ? "SIGKILL" : "SIGTERM");
 	};
+	ensureStartedIfAvailable = async (options) => {
+		try {
+			return await this.ensureStarted(options);
+		} catch (error) {
+			if (!isCompanionUnavailableError(error)) throw error;
+			console.warn(error.message);
+			return null;
+		}
+	};
 	resolveLaunchSpec = () => {
-		const packageJsonPath = require.resolve("@nextclaw/companion/package.json");
+		let packageJsonPath;
+		try {
+			packageJsonPath = require.resolve("@nextclaw/companion/package.json");
+		} catch {
+			throw new CompanionUnavailableError("@nextclaw/companion is not installed. Install it separately to use the companion shell.");
+		}
 		const packageRoot = dirname(packageJsonPath);
 		const mainPath = resolve(packageRoot, "dist", "src", "main.js");
-		if (!existsSync(mainPath)) throw new Error(`Companion app build is missing at ${mainPath}. Build @nextclaw/companion first.`);
+		if (!existsSync(mainPath)) throw new CompanionUnavailableError(`Companion app build is missing at ${mainPath}. Install or build @nextclaw/companion separately to use the companion shell.`);
 		return {
 			command: createRequire(packageJsonPath)("electron"),
 			args: [packageRoot]

package/dist/shared/services/ui/local-ui-discovery.service.js

@@ -1,6 +1,6 @@
 import { isProcessRunning } from "../../utils/cli.utils.js";
-import { localUiRuntimeStore } from "../../stores/local-ui-runtime.store.js";
 import { managedServiceStateStore } from "../../stores/managed-service-state.store.js";
+import { localUiRuntimeStore } from "../../stores/local-ui-runtime.store.js";
 import { resolveLocalUiBaseUrl } from "@nextclaw/core";
 //#region src/shared/services/ui/local-ui-discovery.service.ts
 var LocalUiDiscoveryService = class {

package/dist/shared/services/ui/npm-runtime-update-host.service.js

@@ -1,9 +1,9 @@
 import { NpmRuntimeBundleLayoutStore } from "../../../launcher/npm-runtime-bundle-layout.store.js";
 import { NpmRuntimeBundleService } from "../../../launcher/npm-runtime-bundle.service.js";
-import { NpmRuntimeUpdateSourceService } from "../../../launcher/npm-runtime-update-source.service.js";
-import { NpmRuntimeUpdateStateStore } from "../../../launcher/npm-runtime-update-state.store.js";
 import { NpmRuntimeUpdateManager } from "../../../launcher/npm-runtime-update.manager.js";
 import { NpmRuntimeUpdateService } from "../../../launcher/npm-runtime-update.service.js";
+import { NpmRuntimeUpdateSourceService } from "../../../launcher/npm-runtime-update-source.service.js";
+import { NpmRuntimeUpdateStateStore } from "../../../launcher/npm-runtime-update-state.store.js";
 import { NextclawDistributionService } from "../runtime/nextclaw-distribution.service.js";
 import { requestManagedServiceRestart } from "./service-remote-access.service.js";
 import { eventKeys } from "@nextclaw/shared";

package/dist/shared/services/ui/runtime-control-host.service.js

@@ -1,6 +1,6 @@
-import { pendingRestartStore } from "../../stores/pending-restart.store.js";
 import { controlRemoteService, resolveRemoteServiceView } from "../../../commands/remote/services/remote-service-control.service.js";
 import { requestManagedServiceRestart } from "./service-remote-access.service.js";
+import { pendingRestartStore } from "../../stores/pending-restart.store.js";
 //#region src/shared/services/ui/runtime-control-host.service.ts
 const MANAGED_SERVICE_OWNER_LABEL = "Managed local service";
 const DESKTOP_APP_ONLY_REASON = "App restart is only available in the desktop shell.";

package/dist/shared/services/ui/service-remote-access.service.js

@@ -1,7 +1,7 @@
-import { RemoteAccessHost } from "../../../commands/remote/services/remote-access-host.service.js";
 import { RemoteCommands } from "../../../commands/remote/index.js";
 import { PlatformAuthCommands } from "../../../commands/platform-auth/services/platform-auth-commands.service.js";
 import "../../../commands/platform-auth/index.js";
+import { RemoteAccessHost } from "../../../commands/remote/services/remote-access-host.service.js";
 //#region src/shared/services/ui/service-remote-access.service.ts
 function requestManagedServiceRestart(requestRestart, options = {}) {
 	const uiPort = typeof options.uiPort === "number" && Number.isFinite(options.uiPort) ? Math.floor(options.uiPort) : void 0;

package/dist/shared/services/workspace/workspace-manager.service.js

@@ -1,9 +1,9 @@
 import { findExecutableOnPath } from "../../utils/cli.utils.js";
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { dirname, join, resolve } from "node:path";
 import { APP_NAME, getDataDir } from "@nextclaw/core";
 import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { spawnSync } from "node:child_process";
 //#region src/shared/services/workspace/workspace-manager.service.ts
 var WorkspaceManager = class {
 	constructor(logo) {

package/dist/shared/stores/companion-runtime.store.js

@@ -1,6 +1,6 @@
-import { resolve } from "node:path";
 import { getDataDir } from "@nextclaw/core";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
 //#region src/shared/stores/companion-runtime.store.ts
 var CompanionRuntimeStore = class {
 	get path() {

package/dist/shared/stores/local-ui-runtime.store.js

@@ -1,7 +1,7 @@
 import { resolveUiApiBase } from "../utils/cli.utils.js";
-import { resolve } from "node:path";
 import { getDataDir } from "@nextclaw/core";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
 //#region src/shared/stores/local-ui-runtime.store.ts
 var LocalUiRuntimeStore = class {
 	get path() {

package/dist/shared/stores/managed-service-state.store.js

@@ -1,6 +1,6 @@
-import { resolve } from "node:path";
 import { getDataDir } from "@nextclaw/core";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
 //#region src/shared/stores/managed-service-state.store.ts
 var ManagedServiceStateStore = class {
 	get path() {

package/dist/shared/types/cli.types.d.ts

@@ -16,19 +16,6 @@ type StartCommandOptions = {
   open?: boolean;
   startTimeout?: string | number;
 };
-type CompanionStartCommandOptions = {
-  baseUrl?: string;
-};
-type CompanionEnableCommandOptions = {
-  baseUrl?: string;
-};
-type CompanionDisableCommandOptions = Record<string, never>;
-type CompanionStatusCommandOptions = {
-  json?: boolean;
-};
-type CompanionStopCommandOptions = {
-  force?: boolean;
-};
 type ServiceAutostartCommandOptions = {
   user?: boolean;
   system?: boolean;
@@ -292,4 +279,4 @@ type RequestRestartParams = {
   mode?: "execute" | "notify";
 };
 //#endregion
-export { AccountCommandOptions, AccountSetUsernameCommandOptions, AgentCommandOptions, AgentsListCommandOptions, AgentsNewCommandOptions, AgentsRemoveCommandOptions, AgentsRuntimesCommandOptions, AgentsUpdateCommandOptions, ChannelsAddOptions, ChannelsLoginOptions, CompanionDisableCommandOptions, CompanionEnableCommandOptions, CompanionStartCommandOptions, CompanionStatusCommandOptions, CompanionStopCommandOptions, ConfigGetOptions, ConfigSetOptions, CronAddOptions, DoctorCommandOptions, GatewayCommandOptions, HealthProbe, LoginCommandOptions, LogsTailCommandOptions, MarketplaceSkillsRecommendCommandOptions, MarketplaceSkillsSearchCommandOptions, McpAddCommandOptions, McpDoctorOptions, McpListOptions, PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions, type RemoteConnectCommandOptions, type RemoteDoctorCommandOptions, type RemoteEnableCommandOptions, type RemoteStatusCommandOptions, RequestRestartParams, RuntimeStatusReport, SecretsApplyOptions, SecretsAuditOptions, SecretsConfigureOptions, SecretsReloadOptions, ServiceAutostartCommandOptions, SkillsInfoCommandOptions, SkillsInstalledCommandOptions, StartCommandOptions, StatusCommandOptions, UiCommandOptions, UpdateCommandOptions, UsageCommandOptions };
+export { AccountCommandOptions, AccountSetUsernameCommandOptions, AgentCommandOptions, AgentsListCommandOptions, AgentsNewCommandOptions, AgentsRemoveCommandOptions, AgentsRuntimesCommandOptions, AgentsUpdateCommandOptions, ChannelsAddOptions, ChannelsLoginOptions, ConfigGetOptions, ConfigSetOptions, CronAddOptions, DoctorCommandOptions, GatewayCommandOptions, HealthProbe, LoginCommandOptions, LogsTailCommandOptions, MarketplaceSkillsRecommendCommandOptions, MarketplaceSkillsSearchCommandOptions, McpAddCommandOptions, McpDoctorOptions, McpListOptions, PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions, type RemoteConnectCommandOptions, type RemoteDoctorCommandOptions, type RemoteEnableCommandOptions, type RemoteStatusCommandOptions, RequestRestartParams, RuntimeStatusReport, SecretsApplyOptions, SecretsAuditOptions, SecretsConfigureOptions, SecretsReloadOptions, ServiceAutostartCommandOptions, SkillsInfoCommandOptions, SkillsInstalledCommandOptions, StartCommandOptions, StatusCommandOptions, UiCommandOptions, UpdateCommandOptions, UsageCommandOptions };

package/dist/shared/utils/cli.utils.js

@@ -1,8 +1,8 @@
 import { getPackageVersion } from "./package/package-manifest.utils.js";
-import { spawn, spawnSync } from "node:child_process";
-import { join, resolve } from "node:path";
 import { createExternalCommandEnv, getLogsPath, resolveLocalUiBaseUrl } from "@nextclaw/core";
 import { existsSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { spawn, spawnSync } from "node:child_process";
 import { isIP } from "node:net";
 //#region src/shared/utils/cli.utils.ts
 function resolveUiConfig(config, overrides) {

package/dist/shared/utils/marketplace/cli-subcommand-launch.utils.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
-import { fileURLToPath } from "node:url";
 import { extname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 //#region src/shared/utils/marketplace/cli-subcommand-launch.utils.ts
 const require = createRequire(import.meta.url);
 const TYPESCRIPT_EXTENSIONS = new Set([

package/dist/shared/utils/package/package-manifest.utils.js

@@ -1,7 +1,7 @@
-import { fileURLToPath } from "node:url";
-import { join, resolve } from "node:path";
 import { getPackageVersion as getPackageVersion$1 } from "@nextclaw/core";
 import { readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 //#region src/shared/utils/package/package-manifest.utils.ts
 function readPackageManifest(pkgPath) {
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/service",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "private": false,
   "description": "NextClaw long-running service host and runtime lifecycle.",
   "type": "module",
@@ -26,6 +26,7 @@
   ],
   "nextclaw": {
     "builtinExtensions": [
+      "@nextclaw/channel-extension-feishu",
       "@nextclaw/channel-extension-weixin"
     ]
   },
@@ -34,23 +35,24 @@
     "commander": "^12.1.0",
     "jszip": "^3.10.1",
     "yaml": "^2.8.1",
-    "@nextclaw/channel-extension-weixin": "0.1.3",
-    "@nextclaw/kernel": "0.1.5",
-    "@nextclaw/core": "0.12.16",
-    "@nextclaw/ncp": "0.5.9",
-    "@nextclaw/ncp-agent-runtime": "0.3.19",
-    "@nextclaw/mcp": "0.1.81",
-    "@nextclaw/ncp-mcp": "0.1.83",
-    "@nextclaw/ncp-http-agent-server": "0.3.21",
-    "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.8",
-    "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.8",
-    "@nextclaw/ncp-toolkit": "0.5.14",
-    "@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.1.9",
-    "@nextclaw/openclaw-compat": "1.0.16",
-    "@nextclaw/remote": "0.1.93",
-    "@nextclaw/shared": "0.1.3",
-    "@nextclaw/server": "0.12.16",
-    "@nextclaw/runtime": "0.2.48"
+    "@nextclaw/channel-extension-feishu": "0.1.1",
+    "@nextclaw/core": "0.12.17",
+    "@nextclaw/kernel": "0.1.6",
+    "@nextclaw/mcp": "0.1.82",
+    "@nextclaw/channel-extension-weixin": "0.1.4",
+    "@nextclaw/ncp-http-agent-server": "0.3.22",
+    "@nextclaw/ncp": "0.5.10",
+    "@nextclaw/ncp-toolkit": "0.5.15",
+    "@nextclaw/openclaw-compat": "1.0.17",
+    "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.9",
+    "@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.1.10",
+    "@nextclaw/ncp-agent-runtime": "0.3.20",
+    "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.9",
+    "@nextclaw/remote": "0.1.94",
+    "@nextclaw/ncp-mcp": "0.1.84",
+    "@nextclaw/runtime": "0.2.49",
+    "@nextclaw/shared": "0.1.4",
+    "@nextclaw/server": "0.12.17"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
@@ -60,7 +62,7 @@
     "vitest": "^4.1.2"
   },
   "scripts": {
-    "build": "tsdown $(find src -name '*.ts' ! -name '*.test.ts' ! -path '*/tests/*') --dts --clean --target es2022 --no-fixedExtension --unbundle",
+    "build": "tsdown \"src/**/*.ts\" \"!src/**/*.test.ts\" \"!src/**/tests/**\" --dts --clean --target es2022 --no-fixedExtension --unbundle",
     "lint": "eslint .",
     "tsc": "tsc -p tsconfig.json",
     "test": "vitest"

package/dist/cli/commands/companion/index.d.ts

@@ -1,15 +0,0 @@
-import { CompanionDisableCommandOptions, CompanionEnableCommandOptions, CompanionStartCommandOptions, CompanionStatusCommandOptions, CompanionStopCommandOptions } from "../../../shared/types/cli.types.js";
-import { CompanionProcessService } from "./services/companion-process.service.js";
-
-//#region src/cli/commands/companion/index.d.ts
-declare class CompanionCommands {
-  private readonly companionProcessService;
-  constructor(companionProcessService?: CompanionProcessService);
-  readonly start: (options?: CompanionStartCommandOptions) => Promise<void>;
-  readonly enable: (options?: CompanionEnableCommandOptions) => Promise<void>;
-  readonly disable: (options?: CompanionDisableCommandOptions) => Promise<void>;
-  readonly status: (options?: CompanionStatusCommandOptions) => Promise<void>;
-  readonly stop: (options?: CompanionStopCommandOptions) => Promise<void>;
-}
-//#endregion
-export { CompanionCommands };

package/dist/cli/commands/companion/index.js

@@ -1,24 +0,0 @@
-import { CompanionProcessService } from "./services/companion-process.service.js";
-//#region src/cli/commands/companion/index.ts
-var CompanionCommands = class {
-	constructor(companionProcessService = new CompanionProcessService()) {
-		this.companionProcessService = companionProcessService;
-	}
-	start = async (options = {}) => {
-		await this.companionProcessService.start(options);
-	};
-	enable = async (options = {}) => {
-		await this.companionProcessService.enable(options);
-	};
-	disable = async (options = {}) => {
-		await this.companionProcessService.disable(options);
-	};
-	status = async (options = {}) => {
-		await this.companionProcessService.status(options);
-	};
-	stop = async (options = {}) => {
-		await this.companionProcessService.stop(options);
-	};
-};
-//#endregion
-export { CompanionCommands };

package/dist/cli/commands/companion/services/companion-process.service.d.ts

@@ -1,17 +0,0 @@
-import { CompanionDisableCommandOptions, CompanionEnableCommandOptions, CompanionStartCommandOptions, CompanionStatusCommandOptions, CompanionStopCommandOptions } from "../../../../shared/types/cli.types.js";
-import { CompanionRuntimeService } from "../../../../shared/services/ui/companion-runtime.service.js";
-
-//#region src/cli/commands/companion/services/companion-process.service.d.ts
-declare class CompanionProcessService {
-  private readonly runtimeService;
-  constructor(runtimeService?: CompanionRuntimeService);
-  readonly start: (options?: CompanionStartCommandOptions) => Promise<void>;
-  readonly status: (options?: CompanionStatusCommandOptions) => Promise<void>;
-  readonly stop: (options?: CompanionStopCommandOptions) => Promise<void>;
-  readonly enable: (options?: CompanionEnableCommandOptions) => Promise<void>;
-  readonly disable: (_options?: CompanionDisableCommandOptions) => Promise<void>;
-  private readonly resolveBaseUrl;
-  private readonly printConfigEnabled;
-}
-//#endregion
-export { CompanionProcessService };

package/dist/cli/commands/companion/services/companion-process.service.js

@@ -1,49 +0,0 @@
-import { companionRuntimeService } from "../../../../shared/services/ui/companion-runtime.service.js";
-import "@nextclaw/core";
-//#region src/cli/commands/companion/services/companion-process.service.ts
-var CompanionProcessService = class {
-	constructor(runtimeService = companionRuntimeService) {
-		this.runtimeService = runtimeService;
-	}
-	start = async (options = {}) => {
-		const state = await this.runtimeService.ensureStarted({ baseUrl: this.resolveBaseUrl(options) });
-		this.runtimeService.printStarted(state);
-	};
-	status = async (options = {}) => {
-		this.runtimeService.printStatus(options);
-	};
-	stop = async (options = {}) => {
-		const stopped = await this.runtimeService.ensureStopped(options);
-		this.runtimeService.printStopped(stopped);
-	};
-	enable = async (options = {}) => {
-		const nextConfig = await this.runtimeService.updateEnabled(true, options);
-		this.printConfigEnabled(nextConfig, options.baseUrl);
-	};
-	disable = async (_options = {}) => {
-		const nextConfig = await this.runtimeService.updateEnabled(false);
-		console.log(nextConfig.companion.enabled ? "Companion remains enabled." : "Companion feature disabled. It will stay off until you enable it again.");
-	};
-	resolveBaseUrl = (options) => {
-		const explicitBaseUrl = options.baseUrl?.trim();
-		if (explicitBaseUrl) return explicitBaseUrl.replace(/\/+$/, "");
-		const discoveredBaseUrl = this.runtimeService.resolveDiscoveredBaseUrl();
-		if (discoveredBaseUrl) return discoveredBaseUrl;
-		const runningState = this.runtimeService.getRunningState();
-		if (runningState) return runningState.baseUrl;
-		throw new Error("Cannot resolve NextClaw UI base URL. Start NextClaw first or pass --base-url.");
-	};
-	printConfigEnabled = (config, baseUrl) => {
-		if (this.runtimeService.getRunningState()) {
-			console.log("Companion feature enabled and companion started.");
-			return;
-		}
-		if (baseUrl?.trim()) {
-			console.log("Companion feature enabled.");
-			return;
-		}
-		console.log(config.companion.enabled ? "Companion feature enabled. It will auto-start the next time a local NextClaw runtime is available." : "Companion feature is not enabled.");
-	};
-};
-//#endregion
-export { CompanionProcessService };