@nextclaw/service 0.1.8 → 0.1.9

package/dist/launcher/npm-runtime-bundle.types.d.ts

@@ -1,4 +1,4 @@
-import { UpdateManifest, UpdateProgress, UpdateSnapshot } from "@nextclaw/kernel/update-contract";
+import { UpdateManifest, UpdateProgress, UpdateSnapshot } from "@nextclaw/kernel";
 
 //#region src/launcher/npm-runtime-bundle.types.d.ts
 type NpmRuntimeBundleManifest = {

package/dist/launcher/npm-runtime-update-command.service.js

@@ -14,6 +14,7 @@ var NpmRuntimeUpdateCommandService = class {
 		return snapshot;
 	};
 	runManaged = async (opts) => {
+		const downloadOnly = Boolean(opts.downloadOnly || opts.download);
 		const distribution = NextclawDistributionService.get();
 		const source = new NpmRuntimeUpdateSourceService({ packagedPublicKeyPath: distribution.runtimeUpdatePublicKeyPath });
 		const launcherVersion = distribution.version;
@@ -42,7 +43,7 @@ var NpmRuntimeUpdateCommandService = class {
 		}).run({
 			apply: Boolean(opts.apply),
 			checkOnly: Boolean(opts.check),
-			download: opts.download === void 0 ? true : Boolean(opts.download),
+			applyAfterDownload: !downloadOnly,
 			onProgress: opts.json ? void 0 : this.printProgress
 		});
 	};

package/dist/launcher/npm-runtime-update.manager.d.ts

@@ -3,7 +3,7 @@ import { NpmRuntimeReleaseChannel } from "./npm-runtime-update-source.service.js
 import { NpmRuntimeUpdateStateStore } from "./npm-runtime-update-state.store.js";
 import { NpmRuntimeBundleService } from "./npm-runtime-bundle.service.js";
 import { NpmRuntimeUpdateService } from "./npm-runtime-update.service.js";
-import { UpdateProgress, UpdateSnapshot } from "@nextclaw/kernel/update-contract";
+import { UpdateProgress, UpdateSnapshot } from "@nextclaw/kernel";
 
 //#region src/launcher/npm-runtime-update.manager.d.ts
 type NpmRuntimeUpdateManagerOptions = {
@@ -17,8 +17,8 @@ type NpmRuntimeUpdateManagerOptions = {
   now?: () => Date;
 };
 type NpmRuntimeUpdateActionOptions = {
-  download?: boolean;
   apply?: boolean;
+  applyAfterDownload?: boolean;
   checkOnly?: boolean;
   onProgress?: (progress: UpdateProgress) => void;
 };

package/dist/launcher/npm-runtime-update.manager.js

@@ -16,10 +16,14 @@ var NpmRuntimeUpdateManager = class {
 	getSnapshot = () => this.toSnapshotFromState(this.options.stateStore.read(), { status: this.options.stateStore.read().downloadedVersion ? "downloaded" : "idle" });
 	run = async (options = {}) => {
 		if (options.apply) return this.applyDownloadedUpdate();
+		const applyAfterDownload = options.applyAfterDownload ?? true;
 		const checkedSnapshot = await this.checkForUpdate();
-		if (options.checkOnly || checkedSnapshot.status !== "update-available") return checkedSnapshot;
-		if (options.download === false) return checkedSnapshot;
-		return await this.downloadUpdate(options.onProgress);
+		if (options.checkOnly) return checkedSnapshot;
+		if (applyAfterDownload && checkedSnapshot.status === "downloaded") return this.applyDownloadedUpdate();
+		if (checkedSnapshot.status !== "update-available") return checkedSnapshot;
+		const downloadedSnapshot = await this.downloadUpdate(options.onProgress);
+		if (!applyAfterDownload || downloadedSnapshot.status !== "downloaded") return downloadedSnapshot;
+		return this.applyDownloadedUpdate();
 	};
 	checkForUpdate = async () => {
 		const manifestUrl = this.options.resolveManifestUrl(this.options.channel);

package/dist/launcher/npm-runtime-update.service.d.ts

@@ -1,7 +1,7 @@
 import { NpmRuntimeDownloadedUpdate, NpmRuntimeUpdateProgressReporter } from "./npm-runtime-bundle.types.js";
 import { NpmRuntimeBundleLayoutStore } from "./npm-runtime-bundle-layout.store.js";
 import { NpmRuntimeBundleService } from "./npm-runtime-bundle.service.js";
-import { UpdateManifest, UpdateManifestReader } from "@nextclaw/kernel/update-contract";
+import { UpdateManifest, UpdateManifestReader } from "@nextclaw/kernel";
 
 //#region src/launcher/npm-runtime-update.service.d.ts
 type FetchLike = typeof fetch;

package/dist/launcher/npm-runtime-update.service.js

@@ -1,11 +1,11 @@
 import { compareNpmRuntimeVersions } from "./npm-runtime-bundle.service.js";
+import { UpdateManifestReader, serializeUnsignedUpdateManifest } from "@nextclaw/kernel";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { rm } from "node:fs/promises";
 import { createHash, createPublicKey, verify } from "node:crypto";
 import JSZip from "jszip";
-import { UpdateManifestReader, serializeUnsignedUpdateManifest } from "@nextclaw/kernel/update-contract";
 //#region src/launcher/npm-runtime-update.service.ts
 var NpmRuntimeUpdateService = class {
 	platform;

package/dist/shared/controllers/gateway.controller.js

@@ -267,11 +267,9 @@ var GatewayControllerImpl = class {
 		});
 	};
 	updateRun = async (params) => {
+		const { note, restartDelayMs, sessionKey, timeoutMs } = params;
 		const versionBefore = getPackageVersion$1();
-		params.timeoutMs;
-		const updateCommand = new NpmRuntimeUpdateCommandService();
-		const downloadedSnapshot = await updateCommand.runManaged({ download: true });
-		const snapshot = downloadedSnapshot.status === "downloaded" ? await updateCommand.runManaged({ apply: true }) : downloadedSnapshot;
+		const snapshot = await new NpmRuntimeUpdateCommandService().runManaged({});
 		if (snapshot.status === "blocked" || snapshot.status === "failed") return {
 			ok: false,
 			error: snapshot.errorMessage ?? snapshot.blockReason ?? "update failed",
@@ -283,12 +281,12 @@ var GatewayControllerImpl = class {
 			}
 		};
 		const versionAfter = getPackageVersion$1();
-		const delayMs = params.restartDelayMs ?? 0;
+		const delayMs = restartDelayMs ?? 0;
 		const sentinelPath = await this.writeRestartSentinelPayload({
 			kind: "update.run",
 			status: "ok",
-			sessionKey: params.sessionKey,
-			note: params.note,
+			sessionKey,
+			note,
 			reason: "update.run",
 			strategy: "runtime-bundle"
 		});
@@ -298,7 +296,7 @@ var GatewayControllerImpl = class {
 		});
 		return {
 			ok: true,
-			note: params.note ?? null,
+			note: note ?? null,
 			restart: {
 				scheduled: true,
 				delayMs

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

@@ -56,6 +56,7 @@ type MarketplaceSkillsRecommendCommandOptions = {
 type UpdateCommandOptions = {
   check?: boolean;
   download?: boolean;
+  downloadOnly?: boolean;
   apply?: boolean;
   channel?: string;
   manifestUrl?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/service",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "private": false,
   "description": "NextClaw long-running service host and runtime lifecycle.",
   "type": "module",
@@ -37,21 +37,21 @@
     "yaml": "^2.8.1",
     "@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-agent-runtime": "0.3.20",
     "@nextclaw/ncp": "0.5.10",
-    "@nextclaw/ncp-toolkit": "0.5.15",
-    "@nextclaw/openclaw-compat": "1.0.17",
+    "@nextclaw/ncp-mcp": "0.1.84",
+    "@nextclaw/ncp-http-agent-server": "0.3.22",
     "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.9",
+    "@nextclaw/ncp-toolkit": "0.5.15",
+    "@nextclaw/mcp": "0.1.82",
+    "@nextclaw/kernel": "0.1.6",
     "@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/openclaw-compat": "1.0.17",
     "@nextclaw/runtime": "0.2.49",
     "@nextclaw/shared": "0.1.4",
+    "@nextclaw/remote": "0.1.94",
     "@nextclaw/server": "0.12.17"
   },
   "devDependencies": {