@nextclaw/service 0.6.8 → 0.7.0
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.
- package/dist/app/nextclaw-service-runtime.d.ts.map +1 -1
- package/dist/app/nextclaw-service-runtime.js +2 -1
- package/dist/app/nextclaw-service-runtime.js.map +1 -1
- package/dist/controllers/commands/restart-command.controller.d.ts +3 -0
- package/dist/controllers/commands/restart-command.controller.d.ts.map +1 -1
- package/dist/controllers/commands/restart-command.controller.js +31 -5
- package/dist/controllers/commands/restart-command.controller.js.map +1 -1
- package/dist/controllers/gateway.controller.d.ts +1 -16
- package/dist/controllers/gateway.controller.d.ts.map +1 -1
- package/dist/controllers/gateway.controller.js +0 -106
- package/dist/controllers/gateway.controller.js.map +1 -1
- package/dist/managers/managed-service.manager.d.ts +2 -0
- package/dist/managers/managed-service.manager.d.ts.map +1 -1
- package/dist/managers/managed-service.manager.js +1 -0
- package/dist/managers/managed-service.manager.js.map +1 -1
- package/dist/managers/service-gateway.manager.d.ts.map +1 -1
- package/dist/managers/service-gateway.manager.js +1 -13
- package/dist/managers/service-gateway.manager.js.map +1 -1
- package/dist/managers/service-restart.manager.d.ts +3 -0
- package/dist/managers/service-restart.manager.d.ts.map +1 -1
- package/dist/managers/service-restart.manager.js +32 -8
- package/dist/managers/service-restart.manager.js.map +1 -1
- package/dist/services/gateway/nextclaw-app.service.d.ts +1 -0
- package/dist/services/gateway/nextclaw-app.service.d.ts.map +1 -1
- package/dist/services/gateway/nextclaw-app.service.js +7 -0
- package/dist/services/gateway/nextclaw-app.service.js.map +1 -1
- package/dist/services/runtime/npm-runtime-update-command.service.d.ts.map +1 -1
- package/dist/services/runtime/npm-runtime-update-command.service.js +1 -0
- package/dist/services/runtime/npm-runtime-update-command.service.js.map +1 -1
- package/dist/services/runtime/npm-runtime-update-host.service.js +1 -1
- package/dist/services/runtime/npm-runtime-update.service.js +1 -1
- package/dist/services/ui/runtime-control-host.service.js +3 -3
- package/dist/services/ui/runtime-control-host.service.js.map +1 -1
- package/package.json +22 -22
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextclaw-service-runtime.d.ts","names":[],"sources":["../../src/app/nextclaw-service-runtime.ts"],"mappings":";;;;;KAuBY,6BAAA;EACV,IAAA;AAAA;AAAA,KAGU,6BAAA;EACV,MAAA,GAAS,IAAA;IAAS,OAAA;IAAkB,IAAA;EAAA,MAAqB,OAAA;EACzD,WAAA,GACE,QAAA,UACA,IAAA;IAAS,OAAA;IAAkB,IAAA;EAAA,MACxB,OAAA;AAAA;AAAA,cAGM,sBAAA;EAAA,iBACM,IAAA;EAAA,iBACA,gBAAA;EAAA,iBACA,qBAAA;EAAA,iBACA,cAAA;EAAA,iBACA,cAAA;EAAA,SACR,OAAA,EAAS,6BAAA;EAAA,SACT,QAAA,EAAU,uBAAA;cAEP,OAAA,EAAS,6BAAA;EAAA,
|
|
1
|
+
{"version":3,"file":"nextclaw-service-runtime.d.ts","names":[],"sources":["../../src/app/nextclaw-service-runtime.ts"],"mappings":";;;;;KAuBY,6BAAA;EACV,IAAA;AAAA;AAAA,KAGU,6BAAA;EACV,MAAA,GAAS,IAAA;IAAS,OAAA;IAAkB,IAAA;EAAA,MAAqB,OAAA;EACzD,WAAA,GACE,QAAA,UACA,IAAA;IAAS,OAAA;IAAkB,IAAA;EAAA,MACxB,OAAA;AAAA;AAAA,cAGM,sBAAA;EAAA,iBACM,IAAA;EAAA,iBACA,gBAAA;EAAA,iBACA,qBAAA;EAAA,iBACA,cAAA;EAAA,iBACA,cAAA;EAAA,SACR,OAAA,EAAS,6BAAA;EAAA,SACT,QAAA,EAAU,uBAAA;cAEP,OAAA,EAAS,6BAAA;EAAA,IAsCjB,OAAA,CAAA;EAIJ,OAAA,GAAiB,KAAA,EAAO,iBAAA,KAAoB,OAAA,CAAQ,kBAAA;EAqBpD,OAAA,QAAoB,OAAA;EAOpB,IAAA,GAAc,OAAA;IAAW,MAAA;IAAiB,IAAA;IAAgB,KAAA;EAAA,MAAyB,OAAA;EAkDnF,KAAA,GAAe,IAAA,GAAM,mBAAA,KAA2B,OAAA;EAKhD,KAAA,GAAe,IAAA,EAAM,mBAAA,KAAsB,OAAA;EA4B3C,MAAA,GAAgB,IAAA,EAAM,oBAAA,KAAuB,OAAA;AAAA;AAAA,cAkBlC,6BAAA,GACX,IAAA,gBACC,OAAA"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { isProcessRunning } from "../utils/cli.utils.js";
|
|
2
2
|
import { managedServiceStateStore } from "../stores/managed-service-state.store.js";
|
|
3
3
|
import { NextclawDistributionService } from "../services/runtime/nextclaw-distribution.service.js";
|
|
4
|
-
import { NpmRuntimeUpdateCommandService } from "../services/runtime/npm-runtime-update-command.service.js";
|
|
5
4
|
import { logStartupTrace } from "../utils/startup-trace.utils.js";
|
|
6
5
|
import { ProductActivityReporter } from "../services/product-activity/product-activity-reporter.service.js";
|
|
7
6
|
import { ManagedServiceManager } from "../managers/managed-service.manager.js";
|
|
@@ -9,6 +8,7 @@ import { runCliAgentCommand } from "../utils/cli-agent-runner.utils.js";
|
|
|
9
8
|
import { ServiceCommandManager } from "../managers/service-command.manager.js";
|
|
10
9
|
import { ServiceRestartManager } from "../managers/service-restart.manager.js";
|
|
11
10
|
import { ServiceWorkspaceManager } from "../managers/service-workspace.manager.js";
|
|
11
|
+
import { NpmRuntimeUpdateCommandService } from "../services/runtime/npm-runtime-update-command.service.js";
|
|
12
12
|
import { NpmRuntimeLauncher } from "../launcher/npm-runtime-launcher.service.js";
|
|
13
13
|
import { initializeConfigIfMissing } from "../services/runtime/runtime-config-init.service.js";
|
|
14
14
|
import { APP_NAME, getConfigPath, getDataDir, loadConfig, resolveWorkspacePath } from "@nextclaw/core";
|
|
@@ -29,6 +29,7 @@ var NextclawServiceRuntime = class {
|
|
|
29
29
|
this.workspaceManager = new ServiceWorkspaceManager(NextclawDistributionService.get().templatesDir);
|
|
30
30
|
this.managedServiceManager = new ManagedServiceManager({
|
|
31
31
|
requestRestart: (params) => this.restartManager.requestRestart(params),
|
|
32
|
+
installPlannedRestartRecovery: (recovery) => this.restartManager.installPlannedRestartRecovery(recovery),
|
|
32
33
|
initializeAgentHomeDirectory: (homeDirectory) => this.workspaceManager.createWorkspaceTemplates(homeDirectory)
|
|
33
34
|
});
|
|
34
35
|
this.restartManager = new ServiceRestartManager({ managedService: this.managedServiceManager });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextclaw-service-runtime.js","names":[],"sources":["../../src/app/nextclaw-service-runtime.ts"],"sourcesContent":["import { APP_NAME, getConfigPath, getDataDir, loadConfig, resolveWorkspacePath } from \"@nextclaw/core\";\nimport {\n NextclawKernel,\n runNextclawTask,\n type NextclawHarnessOptions,\n type NextclawTaskInput,\n type NextclawTaskResult,\n} from \"@nextclaw/kernel\";\nimport { existsSync, mkdirSync } from \"node:fs\";\nimport { ManagedServiceManager } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport { ServiceCommandManager, runCliAgentCommand, type NextclawServiceCommands } from \"@nextclaw-service/managers/service-command.manager.js\";\nimport { ServiceRestartManager } from \"@nextclaw-service/managers/service-restart.manager.js\";\nimport { ServiceWorkspaceManager } from \"@nextclaw-service/managers/service-workspace.manager.js\";\nimport { NpmRuntimeLauncher } from \"@nextclaw-service/launcher/npm-runtime-launcher.service.js\";\nimport { NpmRuntimeUpdateCommandService } from \"@nextclaw-service/services/runtime/npm-runtime-update-command.service.js\";\nimport { initializeConfigIfMissing } from \"@nextclaw-service/services/runtime/runtime-config-init.service.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { ProductActivityReporter } from \"@nextclaw-service/services/product-activity/product-activity-reporter.service.js\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport type { AgentCommandOptions, LoginCommandOptions, UpdateCommandOptions } from \"@nextclaw-service/types/cli.types.js\";\nimport { isProcessRunning } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { logStartupTrace } from \"@nextclaw-service/utils/startup-trace.utils.js\";\n\nexport type NextclawServiceRuntimeOptions = {\n logo?: string;\n};\n\nexport type NextclawServiceRuntimeAccount = {\n status: (opts?: { apiBase?: string; json?: boolean }) => Promise<void>;\n setUsername: (\n username: string,\n opts?: { apiBase?: string; json?: boolean },\n ) => Promise<void>;\n};\n\nexport class NextclawServiceRuntime {\n private readonly logo: string;\n private readonly workspaceManager: ServiceWorkspaceManager;\n private readonly managedServiceManager: ManagedServiceManager;\n private readonly restartManager: ServiceRestartManager;\n private readonly commandManager: ServiceCommandManager;\n readonly account: NextclawServiceRuntimeAccount;\n readonly commands: NextclawServiceCommands;\n\n constructor(options: NextclawServiceRuntimeOptions) {\n logStartupTrace(\"cli.runtime.constructor.begin\");\n this.logo = options.logo ?? \"🤖\";\n this.workspaceManager = new ServiceWorkspaceManager(NextclawDistributionService.get().templatesDir);\n this.managedServiceManager = new ManagedServiceManager({\n requestRestart: (params) => this.restartManager.requestRestart(params),\n initializeAgentHomeDirectory: (homeDirectory) => this.workspaceManager.createWorkspaceTemplates(homeDirectory)\n });\n this.restartManager = new ServiceRestartManager({\n managedService: this.managedServiceManager\n });\n this.commandManager = new ServiceCommandManager({\n logo: this.logo,\n init: (params) => this.init(params),\n managedService: this.managedServiceManager,\n restart: this.restartManager,\n workspace: this.workspaceManager\n });\n this.commands = this.commandManager.commands;\n this.account = {\n status: async (opts = {}) => {\n await this.init({ source: \"account status\", auto: true });\n await this.commandManager.platformAuth.accountStatus(opts);\n },\n setUsername: async (username, opts = {}) => {\n await this.init({ source: \"account set-username\", auto: true });\n await this.commandManager.platformAuth.accountSetUsername({\n apiBase: opts.apiBase,\n json: opts.json,\n username\n });\n },\n };\n logStartupTrace(\"cli.runtime.constructor.end\");\n }\n\n get version(): string {\n return NextclawDistributionService.get().version;\n }\n\n runTask = async (input: NextclawTaskInput): Promise<NextclawTaskResult> => {\n const configPath = getConfigPath();\n const distribution = NextclawDistributionService.get();\n const productActivityReporter = new ProductActivityReporter({\n homeDir: getDataDir(),\n productVersion: distribution.version,\n environment: distribution.productEnvironment,\n releaseChannel: distribution.releaseChannel,\n loadConfig: () => loadConfig(configPath),\n });\n const options: NextclawHarnessOptions = {\n builtInAppsDirectory: distribution.builtInAppsDirectory,\n configPath,\n homeDir: getDataDir(),\n portableServiceRunnerPath: distribution.portableServiceRunnerPath,\n productActivitySink: productActivityReporter,\n productVersion: distribution.version,\n };\n return await runNextclawTask(input, options);\n };\n\n onboard = async (): Promise<void> => {\n console.warn(\n `Warning: ${APP_NAME} onboard is deprecated. Use \"${APP_NAME} init\" instead.`,\n );\n await this.init({ source: \"onboard\" });\n };\n\n init = async (options: { source?: string; auto?: boolean; force?: boolean } = {}): Promise<void> => {\n const source = options.source ?? \"init\";\n const prefix = options.auto ? \"Auto init\" : \"Init\";\n const force = Boolean(options.force);\n\n const configPath = getConfigPath();\n const createdConfig = initializeConfigIfMissing(configPath);\n\n const config = loadConfig();\n const workspacePath = resolveWorkspacePath(config.agents.defaults.workspace);\n const workspaceExisted = existsSync(workspacePath);\n mkdirSync(workspacePath, { recursive: true });\n const templateResult = this.workspaceManager.createWorkspaceTemplates(\n workspacePath,\n { force },\n );\n\n if (createdConfig) {\n console.log(`✓ ${prefix}: created config at ${configPath}`);\n }\n if (!workspaceExisted) {\n console.log(`✓ ${prefix}: created workspace at ${workspacePath}`);\n }\n for (const file of templateResult.created) {\n console.log(`✓ ${prefix}: created ${file}`);\n }\n if (\n !createdConfig &&\n workspaceExisted &&\n templateResult.created.length === 0\n ) {\n console.log(`${prefix}: already initialized.`);\n }\n\n if (!options.auto) {\n console.log(`\\n${this.logo} ${APP_NAME} is ready! (${source})`);\n console.log(\"\\nNext steps:\");\n if (createdConfig) {\n console.log(` 1. Chat now (OpenCode Zen needs no API key): ${APP_NAME} agent -m \"Hello!\"`);\n } else {\n console.log(` 1. Chat: ${APP_NAME} agent -m \"Hello!\"`);\n }\n console.log(` 2. Optional: configure another provider in ${configPath}`);\n } else {\n console.log(\n `Tip: Run \"${APP_NAME} init${force ? \" --force\" : \"\"}\" to re-run initialization if needed.`,\n );\n }\n };\n\n login = async (opts: LoginCommandOptions = {}): Promise<void> => {\n await this.init({ source: \"login\", auto: true });\n await this.commandManager.platformAuth.login(opts);\n };\n\n agent = async (opts: AgentCommandOptions): Promise<void> => {\n const configPath = getConfigPath();\n const distribution = NextclawDistributionService.get();\n const productActivityReporter = new ProductActivityReporter({\n homeDir: getDataDir(),\n productVersion: distribution.version,\n environment: distribution.productEnvironment,\n releaseChannel: distribution.releaseChannel,\n loadConfig: () => loadConfig(configPath),\n });\n const kernel = new NextclawKernel({\n homeDir: getDataDir(),\n configPath,\n portableServiceRunnerPath: distribution.portableServiceRunnerPath,\n productVersion: distribution.version,\n runtimeVersion: distribution.version,\n productActivitySink: productActivityReporter,\n });\n const config = kernel.configManager.config;\n\n await runCliAgentCommand({\n logo: this.logo,\n opts,\n config,\n kernel,\n });\n };\n\n update = async (opts: UpdateCommandOptions): Promise<void> => {\n const versionBefore = this.version;\n if (!opts.json) {\n const installationLabel = process.env.NEXTCLAW_DESKTOP_COMMAND_SURFACE === \"1\" ? \"desktop runtime\" : \"npm launcher\";\n console.log(`Current ${installationLabel} version: ${versionBefore}`);\n }\n const snapshot = await new NpmRuntimeUpdateCommandService().run(opts);\n if (snapshot.status === \"blocked\" || snapshot.status === \"failed\") {\n process.exit(1);\n }\n\n const state = managedServiceStateStore.read();\n if (snapshot.requiresRestart && state && isProcessRunning(state.pid)) {\n console.log(`Tip: restart ${APP_NAME} to apply the update.`);\n }\n };\n}\n\nexport const runNextclawNpmRuntimeLauncher = (\n argv: string[] = process.argv,\n): Promise<never> => {\n const distribution = NextclawDistributionService.get();\n return new NpmRuntimeLauncher({\n argv,\n launcherVersion: distribution.version,\n packagedAppEntrypoint: distribution.appEntrypoint,\n packagedPortableRunnerPath: distribution.portableServiceRunnerPath,\n }).run();\n};\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nextclaw-service-runtime.js","names":[],"sources":["../../src/app/nextclaw-service-runtime.ts"],"sourcesContent":["import { APP_NAME, getConfigPath, getDataDir, loadConfig, resolveWorkspacePath } from \"@nextclaw/core\";\nimport {\n NextclawKernel,\n runNextclawTask,\n type NextclawHarnessOptions,\n type NextclawTaskInput,\n type NextclawTaskResult,\n} from \"@nextclaw/kernel\";\nimport { existsSync, mkdirSync } from \"node:fs\";\nimport { ManagedServiceManager } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport { ServiceCommandManager, runCliAgentCommand, type NextclawServiceCommands } from \"@nextclaw-service/managers/service-command.manager.js\";\nimport { ServiceRestartManager } from \"@nextclaw-service/managers/service-restart.manager.js\";\nimport { ServiceWorkspaceManager } from \"@nextclaw-service/managers/service-workspace.manager.js\";\nimport { NpmRuntimeLauncher } from \"@nextclaw-service/launcher/npm-runtime-launcher.service.js\";\nimport { NpmRuntimeUpdateCommandService } from \"@nextclaw-service/services/runtime/npm-runtime-update-command.service.js\";\nimport { initializeConfigIfMissing } from \"@nextclaw-service/services/runtime/runtime-config-init.service.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { ProductActivityReporter } from \"@nextclaw-service/services/product-activity/product-activity-reporter.service.js\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport type { AgentCommandOptions, LoginCommandOptions, UpdateCommandOptions } from \"@nextclaw-service/types/cli.types.js\";\nimport { isProcessRunning } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { logStartupTrace } from \"@nextclaw-service/utils/startup-trace.utils.js\";\n\nexport type NextclawServiceRuntimeOptions = {\n logo?: string;\n};\n\nexport type NextclawServiceRuntimeAccount = {\n status: (opts?: { apiBase?: string; json?: boolean }) => Promise<void>;\n setUsername: (\n username: string,\n opts?: { apiBase?: string; json?: boolean },\n ) => Promise<void>;\n};\n\nexport class NextclawServiceRuntime {\n private readonly logo: string;\n private readonly workspaceManager: ServiceWorkspaceManager;\n private readonly managedServiceManager: ManagedServiceManager;\n private readonly restartManager: ServiceRestartManager;\n private readonly commandManager: ServiceCommandManager;\n readonly account: NextclawServiceRuntimeAccount;\n readonly commands: NextclawServiceCommands;\n\n constructor(options: NextclawServiceRuntimeOptions) {\n logStartupTrace(\"cli.runtime.constructor.begin\");\n this.logo = options.logo ?? \"🤖\";\n this.workspaceManager = new ServiceWorkspaceManager(NextclawDistributionService.get().templatesDir);\n this.managedServiceManager = new ManagedServiceManager({\n requestRestart: (params) => this.restartManager.requestRestart(params),\n installPlannedRestartRecovery: (recovery) =>\n this.restartManager.installPlannedRestartRecovery(recovery),\n initializeAgentHomeDirectory: (homeDirectory) => this.workspaceManager.createWorkspaceTemplates(homeDirectory)\n });\n this.restartManager = new ServiceRestartManager({\n managedService: this.managedServiceManager\n });\n this.commandManager = new ServiceCommandManager({\n logo: this.logo,\n init: (params) => this.init(params),\n managedService: this.managedServiceManager,\n restart: this.restartManager,\n workspace: this.workspaceManager\n });\n this.commands = this.commandManager.commands;\n this.account = {\n status: async (opts = {}) => {\n await this.init({ source: \"account status\", auto: true });\n await this.commandManager.platformAuth.accountStatus(opts);\n },\n setUsername: async (username, opts = {}) => {\n await this.init({ source: \"account set-username\", auto: true });\n await this.commandManager.platformAuth.accountSetUsername({\n apiBase: opts.apiBase,\n json: opts.json,\n username\n });\n },\n };\n logStartupTrace(\"cli.runtime.constructor.end\");\n }\n\n get version(): string {\n return NextclawDistributionService.get().version;\n }\n\n runTask = async (input: NextclawTaskInput): Promise<NextclawTaskResult> => {\n const configPath = getConfigPath();\n const distribution = NextclawDistributionService.get();\n const productActivityReporter = new ProductActivityReporter({\n homeDir: getDataDir(),\n productVersion: distribution.version,\n environment: distribution.productEnvironment,\n releaseChannel: distribution.releaseChannel,\n loadConfig: () => loadConfig(configPath),\n });\n const options: NextclawHarnessOptions = {\n builtInAppsDirectory: distribution.builtInAppsDirectory,\n configPath,\n homeDir: getDataDir(),\n portableServiceRunnerPath: distribution.portableServiceRunnerPath,\n productActivitySink: productActivityReporter,\n productVersion: distribution.version,\n };\n return await runNextclawTask(input, options);\n };\n\n onboard = async (): Promise<void> => {\n console.warn(\n `Warning: ${APP_NAME} onboard is deprecated. Use \"${APP_NAME} init\" instead.`,\n );\n await this.init({ source: \"onboard\" });\n };\n\n init = async (options: { source?: string; auto?: boolean; force?: boolean } = {}): Promise<void> => {\n const source = options.source ?? \"init\";\n const prefix = options.auto ? \"Auto init\" : \"Init\";\n const force = Boolean(options.force);\n\n const configPath = getConfigPath();\n const createdConfig = initializeConfigIfMissing(configPath);\n\n const config = loadConfig();\n const workspacePath = resolveWorkspacePath(config.agents.defaults.workspace);\n const workspaceExisted = existsSync(workspacePath);\n mkdirSync(workspacePath, { recursive: true });\n const templateResult = this.workspaceManager.createWorkspaceTemplates(\n workspacePath,\n { force },\n );\n\n if (createdConfig) {\n console.log(`✓ ${prefix}: created config at ${configPath}`);\n }\n if (!workspaceExisted) {\n console.log(`✓ ${prefix}: created workspace at ${workspacePath}`);\n }\n for (const file of templateResult.created) {\n console.log(`✓ ${prefix}: created ${file}`);\n }\n if (\n !createdConfig &&\n workspaceExisted &&\n templateResult.created.length === 0\n ) {\n console.log(`${prefix}: already initialized.`);\n }\n\n if (!options.auto) {\n console.log(`\\n${this.logo} ${APP_NAME} is ready! (${source})`);\n console.log(\"\\nNext steps:\");\n if (createdConfig) {\n console.log(` 1. Chat now (OpenCode Zen needs no API key): ${APP_NAME} agent -m \"Hello!\"`);\n } else {\n console.log(` 1. Chat: ${APP_NAME} agent -m \"Hello!\"`);\n }\n console.log(` 2. Optional: configure another provider in ${configPath}`);\n } else {\n console.log(\n `Tip: Run \"${APP_NAME} init${force ? \" --force\" : \"\"}\" to re-run initialization if needed.`,\n );\n }\n };\n\n login = async (opts: LoginCommandOptions = {}): Promise<void> => {\n await this.init({ source: \"login\", auto: true });\n await this.commandManager.platformAuth.login(opts);\n };\n\n agent = async (opts: AgentCommandOptions): Promise<void> => {\n const configPath = getConfigPath();\n const distribution = NextclawDistributionService.get();\n const productActivityReporter = new ProductActivityReporter({\n homeDir: getDataDir(),\n productVersion: distribution.version,\n environment: distribution.productEnvironment,\n releaseChannel: distribution.releaseChannel,\n loadConfig: () => loadConfig(configPath),\n });\n const kernel = new NextclawKernel({\n homeDir: getDataDir(),\n configPath,\n portableServiceRunnerPath: distribution.portableServiceRunnerPath,\n productVersion: distribution.version,\n runtimeVersion: distribution.version,\n productActivitySink: productActivityReporter,\n });\n const config = kernel.configManager.config;\n\n await runCliAgentCommand({\n logo: this.logo,\n opts,\n config,\n kernel,\n });\n };\n\n update = async (opts: UpdateCommandOptions): Promise<void> => {\n const versionBefore = this.version;\n if (!opts.json) {\n const installationLabel = process.env.NEXTCLAW_DESKTOP_COMMAND_SURFACE === \"1\" ? \"desktop runtime\" : \"npm launcher\";\n console.log(`Current ${installationLabel} version: ${versionBefore}`);\n }\n const snapshot = await new NpmRuntimeUpdateCommandService().run(opts);\n if (snapshot.status === \"blocked\" || snapshot.status === \"failed\") {\n process.exit(1);\n }\n\n const state = managedServiceStateStore.read();\n if (snapshot.requiresRestart && state && isProcessRunning(state.pid)) {\n console.log(`Tip: restart ${APP_NAME} to apply the update.`);\n }\n };\n}\n\nexport const runNextclawNpmRuntimeLauncher = (\n argv: string[] = process.argv,\n): Promise<never> => {\n const distribution = NextclawDistributionService.get();\n return new NpmRuntimeLauncher({\n argv,\n launcherVersion: distribution.version,\n packagedAppEntrypoint: distribution.appEntrypoint,\n packagedPortableRunnerPath: distribution.portableServiceRunnerPath,\n }).run();\n};\n"],"mappings":"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"}
|
|
@@ -12,6 +12,9 @@ declare class RestartCommands {
|
|
|
12
12
|
writeRestartSentinelFromExecContext: (reason: string) => Promise<void>;
|
|
13
13
|
});
|
|
14
14
|
run: (opts: StartCommandOptions) => Promise<void>;
|
|
15
|
+
private replaceForegroundRuntime;
|
|
16
|
+
private tryControlledRestart;
|
|
17
|
+
private requestRuntimeRestart;
|
|
15
18
|
private restartForegroundRuntime;
|
|
16
19
|
private resolveAdoptableForegroundRuntimePid;
|
|
17
20
|
private isAdoptableNextclawRuntimeCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart-command.controller.d.ts","names":[],"sources":["../../../src/controllers/commands/restart-command.controller.ts"],"mappings":";;;;;cAUa,eAAA;EAAA,iBAEQ,IAAA;cAAA,IAAA;IACf,qBAAA,EAAuB,qBAAA;IACvB,aAAA,EAAe,aAAA;IACf,gBAAA;IACA,mCAAA,GAAsC,MAAA,aAAmB,OAAA;EAAA;EAI7D,GAAA,GAAa,IAAA,EAAM,mBAAA,KAAsB,OAAA;EAAA,
|
|
1
|
+
{"version":3,"file":"restart-command.controller.d.ts","names":[],"sources":["../../../src/controllers/commands/restart-command.controller.ts"],"mappings":";;;;;cAUa,eAAA;EAAA,iBAEQ,IAAA;cAAA,IAAA;IACf,qBAAA,EAAuB,qBAAA;IACvB,aAAA,EAAe,aAAA;IACf,gBAAA;IACA,mCAAA,GAAsC,MAAA,aAAmB,OAAA;EAAA;EAI7D,GAAA,GAAa,IAAA,EAAM,mBAAA,KAAsB,OAAA;EAAA,QA+CjC,wBAAA;EAAA,QAKA,oBAAA;EAAA,QAiBA,qBAAA;EAAA,QAoBA,wBAAA;EAAA,QA6BA,oCAAA;EAAA,QAQA,iCAAA;AAAA"}
|
|
@@ -11,7 +11,7 @@ var RestartCommands = class {
|
|
|
11
11
|
this.deps = deps;
|
|
12
12
|
}
|
|
13
13
|
run = async (opts) => {
|
|
14
|
-
await this.
|
|
14
|
+
if (await this.tryControlledRestart(opts)) return;
|
|
15
15
|
const uiOverrides = resolveManagedServiceUiOverrides({
|
|
16
16
|
uiPort: opts.uiPort,
|
|
17
17
|
forcedPublicHost: this.deps.forcedPublicHost
|
|
@@ -19,14 +19,14 @@ var RestartCommands = class {
|
|
|
19
19
|
const targetUi = resolveUiConfig(loadConfig(), uiOverrides);
|
|
20
20
|
const state = managedServiceStateStore.read();
|
|
21
21
|
if (state && isProcessRunning(state.pid)) {
|
|
22
|
+
await this.deps.writeRestartSentinelFromExecContext("cli.restart");
|
|
22
23
|
console.log(`Restarting ${APP_NAME}...`);
|
|
23
24
|
await this.deps.runtimeCommandService.stopService();
|
|
24
25
|
} else {
|
|
25
26
|
const foregroundRuntime = localUiRuntimeStore.read();
|
|
26
27
|
const foregroundMatchesTarget = Boolean(foregroundRuntime && isProcessRunning(foregroundRuntime.pid) && foregroundRuntime.uiPort === targetUi.port);
|
|
27
28
|
if (foregroundRuntime && foregroundMatchesTarget) {
|
|
28
|
-
|
|
29
|
-
await this.deps.startCommands.run(opts);
|
|
29
|
+
await this.replaceForegroundRuntime(foregroundRuntime.pid, opts);
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
if (state) {
|
|
@@ -37,8 +37,7 @@ var RestartCommands = class {
|
|
|
37
37
|
if (unmanagedHealthyServiceMessage) {
|
|
38
38
|
const adoptedRuntimePid = this.resolveAdoptableForegroundRuntimePid(targetUi.port);
|
|
39
39
|
if (adoptedRuntimePid) {
|
|
40
|
-
|
|
41
|
-
await this.deps.startCommands.run(opts);
|
|
40
|
+
await this.replaceForegroundRuntime(adoptedRuntimePid, opts);
|
|
42
41
|
return;
|
|
43
42
|
}
|
|
44
43
|
console.error(`Error: Cannot restart ${APP_NAME} because the target UI/API port is already served by a healthy unmanaged instance.`);
|
|
@@ -49,6 +48,33 @@ var RestartCommands = class {
|
|
|
49
48
|
}
|
|
50
49
|
await this.deps.startCommands.run(opts);
|
|
51
50
|
};
|
|
51
|
+
replaceForegroundRuntime = async (pid, opts) => {
|
|
52
|
+
await this.deps.writeRestartSentinelFromExecContext("cli.restart");
|
|
53
|
+
if (await this.restartForegroundRuntime(pid)) await this.deps.startCommands.run(opts);
|
|
54
|
+
};
|
|
55
|
+
tryControlledRestart = async (opts) => {
|
|
56
|
+
if (opts.uiPort !== void 0 || opts.open === true || opts.startTimeout !== void 0) return false;
|
|
57
|
+
const managed = managedServiceStateStore.read();
|
|
58
|
+
const foreground = localUiRuntimeStore.read();
|
|
59
|
+
const targetUi = resolveUiConfig(loadConfig(), resolveManagedServiceUiOverrides({
|
|
60
|
+
uiPort: void 0,
|
|
61
|
+
forcedPublicHost: this.deps.forcedPublicHost
|
|
62
|
+
}));
|
|
63
|
+
const target = managed && isProcessRunning(managed.pid) ? managed : foreground && foreground.uiPort === targetUi.port && isProcessRunning(foreground.pid) ? foreground : null;
|
|
64
|
+
if (!target || !await this.requestRuntimeRestart(target.apiUrl)) return false;
|
|
65
|
+
console.log(`Restarting ${APP_NAME} through the running host...`);
|
|
66
|
+
return true;
|
|
67
|
+
};
|
|
68
|
+
requestRuntimeRestart = async (apiUrl) => {
|
|
69
|
+
const response = await fetch(`${apiUrl.replace(/\/$/, "")}/runtime/control/restart-service`, {
|
|
70
|
+
method: "POST",
|
|
71
|
+
signal: AbortSignal.timeout(3e4)
|
|
72
|
+
});
|
|
73
|
+
if (response.status === 404) return false;
|
|
74
|
+
const result = await response.json();
|
|
75
|
+
if (!response.ok || result.ok !== true || result.data?.accepted !== true) throw new Error(result.error?.message ?? "The running host did not accept the restart.");
|
|
76
|
+
return true;
|
|
77
|
+
};
|
|
52
78
|
restartForegroundRuntime = async (pid) => {
|
|
53
79
|
console.log(`Restarting ${APP_NAME} foreground runtime (PID ${pid})...`);
|
|
54
80
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart-command.controller.js","names":[],"sources":["../../../src/controllers/commands/restart-command.controller.ts"],"sourcesContent":["import { APP_NAME, loadConfig } from \"@nextclaw/core\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport { localUiRuntimeStore } from \"@nextclaw-service/stores/local-ui-runtime.store.js\";\nimport { findListeningProcessByPort, isProcessRunning, resolveUiConfig, waitForExit } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { resolveManagedServiceUiOverrides } from \"@nextclaw-service/utils/runtime-helpers.utils.js\";\nimport { describeUnmanagedHealthyTargetMessage } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport type { ManagedServiceManager } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport type { StartCommandOptions } from \"@nextclaw-service/types/cli.types.js\";\nimport type { StartCommands } from \"@nextclaw-service/controllers/commands/start-command.controller.js\";\n\nexport class RestartCommands {\n constructor(\n private readonly deps: {\n runtimeCommandService: ManagedServiceManager;\n startCommands: StartCommands;\n forcedPublicHost: string;\n writeRestartSentinelFromExecContext: (reason: string) => Promise<void>;\n }\n ) {}\n\n run = async (opts: StartCommandOptions): Promise<void> => {\n await this.
|
|
1
|
+
{"version":3,"file":"restart-command.controller.js","names":[],"sources":["../../../src/controllers/commands/restart-command.controller.ts"],"sourcesContent":["import { APP_NAME, loadConfig } from \"@nextclaw/core\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport { localUiRuntimeStore } from \"@nextclaw-service/stores/local-ui-runtime.store.js\";\nimport { findListeningProcessByPort, isProcessRunning, resolveUiConfig, waitForExit } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { resolveManagedServiceUiOverrides } from \"@nextclaw-service/utils/runtime-helpers.utils.js\";\nimport { describeUnmanagedHealthyTargetMessage } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport type { ManagedServiceManager } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport type { StartCommandOptions } from \"@nextclaw-service/types/cli.types.js\";\nimport type { StartCommands } from \"@nextclaw-service/controllers/commands/start-command.controller.js\";\n\nexport class RestartCommands {\n constructor(\n private readonly deps: {\n runtimeCommandService: ManagedServiceManager;\n startCommands: StartCommands;\n forcedPublicHost: string;\n writeRestartSentinelFromExecContext: (reason: string) => Promise<void>;\n }\n ) {}\n\n run = async (opts: StartCommandOptions): Promise<void> => {\n if (await this.tryControlledRestart(opts)) return;\n const uiOverrides = resolveManagedServiceUiOverrides({\n uiPort: opts.uiPort,\n forcedPublicHost: this.deps.forcedPublicHost\n });\n const targetUi = resolveUiConfig(loadConfig(), uiOverrides);\n const state = managedServiceStateStore.read();\n if (state && isProcessRunning(state.pid)) {\n await this.deps.writeRestartSentinelFromExecContext(\"cli.restart\");\n console.log(`Restarting ${APP_NAME}...`);\n await this.deps.runtimeCommandService.stopService();\n } else {\n const foregroundRuntime = localUiRuntimeStore.read();\n const foregroundMatchesTarget = Boolean(\n foregroundRuntime &&\n isProcessRunning(foregroundRuntime.pid) &&\n foregroundRuntime.uiPort === targetUi.port\n );\n if (foregroundRuntime && foregroundMatchesTarget) {\n await this.replaceForegroundRuntime(foregroundRuntime.pid, opts);\n return;\n }\n if (state) {\n managedServiceStateStore.clear();\n console.log(\"Service state was stale and has been cleaned up.\");\n }\n\n const unmanagedHealthyServiceMessage = await describeUnmanagedHealthyTargetMessage({ uiOverrides });\n if (unmanagedHealthyServiceMessage) {\n const adoptedRuntimePid = this.resolveAdoptableForegroundRuntimePid(targetUi.port);\n if (adoptedRuntimePid) {\n await this.replaceForegroundRuntime(adoptedRuntimePid, opts);\n return;\n }\n console.error(`Error: Cannot restart ${APP_NAME} because the target UI/API port is already served by a healthy unmanaged instance.`);\n console.error(unmanagedHealthyServiceMessage);\n return;\n }\n if (!state) {\n console.log(\"No running service found. Starting a new service.\");\n }\n }\n\n await this.deps.startCommands.run(opts);\n };\n\n private replaceForegroundRuntime = async (pid: number, opts: StartCommandOptions): Promise<void> => {\n await this.deps.writeRestartSentinelFromExecContext(\"cli.restart\");\n if (await this.restartForegroundRuntime(pid)) await this.deps.startCommands.run(opts);\n };\n\n private tryControlledRestart = async (opts: StartCommandOptions): Promise<boolean> => {\n if (opts.uiPort !== undefined || opts.open === true || opts.startTimeout !== undefined) return false;\n const managed = managedServiceStateStore.read();\n const foreground = localUiRuntimeStore.read();\n const targetUi = resolveUiConfig(loadConfig(), resolveManagedServiceUiOverrides({\n uiPort: undefined,\n forcedPublicHost: this.deps.forcedPublicHost,\n }));\n const target = managed && isProcessRunning(managed.pid)\n ? managed\n : foreground && foreground.uiPort === targetUi.port && isProcessRunning(foreground.pid)\n ? foreground : null;\n if (!target || !await this.requestRuntimeRestart(target.apiUrl)) return false;\n console.log(`Restarting ${APP_NAME} through the running host...`);\n return true;\n };\n\n private requestRuntimeRestart = async (apiUrl: string): Promise<boolean> => {\n const response = await fetch(\n `${apiUrl.replace(/\\/$/, \"\")}/runtime/control/restart-service`,\n {\n method: \"POST\",\n signal: AbortSignal.timeout(30_000),\n },\n );\n if (response.status === 404) return false;\n const result = await response.json() as {\n ok?: boolean;\n data?: { accepted?: boolean };\n error?: { message?: string };\n };\n if (!response.ok || result.ok !== true || result.data?.accepted !== true) {\n throw new Error(result.error?.message ?? \"The running host did not accept the restart.\");\n }\n return true;\n };\n\n private restartForegroundRuntime = async (pid: number): Promise<boolean> => {\n console.log(`Restarting ${APP_NAME} foreground runtime (PID ${pid})...`);\n try {\n process.kill(pid, \"SIGTERM\");\n } catch (error) {\n console.error(`Failed to stop foreground runtime: ${String(error)}`);\n return false;\n }\n\n const stopped = await waitForExit(pid, 3000);\n if (!stopped) {\n try {\n process.kill(pid, \"SIGKILL\");\n } catch (error) {\n console.error(`Failed to force stop foreground runtime: ${String(error)}`);\n return false;\n }\n const forcedStopped = await waitForExit(pid, 2000);\n if (!forcedStopped) {\n console.error(`Failed to stop foreground runtime PID ${pid}.`);\n return false;\n }\n }\n\n localUiRuntimeStore.clearIfOwnedByProcess(pid);\n console.log(`✓ ${APP_NAME} foreground runtime stopped`);\n return true;\n };\n\n private resolveAdoptableForegroundRuntimePid = (port: number): number | null => {\n const listeningProcess = findListeningProcessByPort(port);\n if (!listeningProcess || !isProcessRunning(listeningProcess.pid)) {\n return null;\n }\n return this.isAdoptableNextclawRuntimeCommand(listeningProcess.command) ? listeningProcess.pid : null;\n };\n\n private isAdoptableNextclawRuntimeCommand = (command: string | null): boolean => {\n const normalized = command?.trim() ?? \"\";\n if (!normalized) {\n return false;\n }\n return (\n /\\bserve\\b/.test(normalized) &&\n (\n normalized.includes(\"/dist/cli/app/index.js\") ||\n normalized.includes(\"/src/cli/app/index.js\") ||\n normalized.includes(\"/runtime/dist/cli/app/index.js\")\n )\n );\n };\n}\n"],"mappings":"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"}
|
|
@@ -1,22 +1,13 @@
|
|
|
1
1
|
import { GatewayController } from "@nextclaw/core";
|
|
2
|
-
import { ConfigManager
|
|
2
|
+
import { ConfigManager } from "@nextclaw/kernel";
|
|
3
3
|
|
|
4
4
|
//#region src/controllers/gateway.controller.d.ts
|
|
5
5
|
type ControllerDeps = {
|
|
6
6
|
configManager: ConfigManager;
|
|
7
|
-
sessionManager?: SessionManager;
|
|
8
|
-
requestRestart?: (options?: {
|
|
9
|
-
delayMs?: number;
|
|
10
|
-
reason?: string;
|
|
11
|
-
}) => Promise<void> | void;
|
|
12
7
|
};
|
|
13
8
|
declare class GatewayControllerImpl implements GatewayController {
|
|
14
9
|
private deps;
|
|
15
10
|
constructor(deps: ControllerDeps);
|
|
16
|
-
private normalizeOptionalString;
|
|
17
|
-
private resolveDeliveryContext;
|
|
18
|
-
private writeUpdateRestartSentinelPayload;
|
|
19
|
-
private requestRestart;
|
|
20
11
|
getConfig: () => Promise<Record<string, unknown>>;
|
|
21
12
|
getConfigSchema: () => Promise<Record<string, unknown>>;
|
|
22
13
|
applyConfig: (params: {
|
|
@@ -29,12 +20,6 @@ declare class GatewayControllerImpl implements GatewayController {
|
|
|
29
20
|
baseHash?: string;
|
|
30
21
|
note?: string;
|
|
31
22
|
}) => Promise<Record<string, unknown>>;
|
|
32
|
-
updateRun: (params: {
|
|
33
|
-
note?: string;
|
|
34
|
-
restartDelayMs?: number;
|
|
35
|
-
timeoutMs?: number;
|
|
36
|
-
sessionKey?: string;
|
|
37
|
-
}) => Promise<Record<string, unknown>>;
|
|
38
23
|
}
|
|
39
24
|
//#endregion
|
|
40
25
|
export { GatewayControllerImpl };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.controller.d.ts","names":[],"sources":["../../src/controllers/gateway.controller.ts"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"gateway.controller.d.ts","names":[],"sources":["../../src/controllers/gateway.controller.ts"],"mappings":";;;;KAMK,cAAA;EACH,aAAA,EAAe,aAAA;AAAA;AAAA,cAGJ,qBAAA,YAAiC,iBAAA;EAAA,QACxB,IAAA;cAAA,IAAA,EAAM,cAAA;EAE1B,SAAA,QAAsB,OAAA,CAAQ,MAAA;EAI9B,eAAA,QAA4B,OAAA,CAAQ,MAAA;EAIpC,WAAA,GAAqB,MAAA;IACnB,GAAA;IACA,QAAA;IACA,IAAA;EAAA,MACE,OAAA,CAAQ,MAAA;EASZ,WAAA,GAAqB,MAAA;IACnB,GAAA;IACA,QAAA;IACA,IAAA;EAAA,MACE,OAAA,CAAQ,MAAA;AAAA"}
|
|
@@ -1,73 +1,11 @@
|
|
|
1
1
|
import { getPackageVersion as getPackageVersion$1 } from "../utils/package/package-manifest.utils.js";
|
|
2
2
|
import "../utils/cli.utils.js";
|
|
3
|
-
import { NpmRuntimeUpdateCommandService } from "../services/runtime/npm-runtime-update-command.service.js";
|
|
4
|
-
import { parseSessionKey, writeRestartSentinel } from "../utils/restart-sentinel.utils.js";
|
|
5
3
|
import "@nextclaw/core";
|
|
6
4
|
//#region src/controllers/gateway.controller.ts
|
|
7
5
|
var GatewayControllerImpl = class {
|
|
8
6
|
constructor(deps) {
|
|
9
7
|
this.deps = deps;
|
|
10
8
|
}
|
|
11
|
-
normalizeOptionalString = (value) => {
|
|
12
|
-
if (typeof value !== "string") return;
|
|
13
|
-
return value.trim() || void 0;
|
|
14
|
-
};
|
|
15
|
-
resolveDeliveryContext = async (sessionKey) => {
|
|
16
|
-
const normalizedSessionKey = this.normalizeOptionalString(sessionKey);
|
|
17
|
-
const keyTarget = parseSessionKey(normalizedSessionKey);
|
|
18
|
-
const keyRoute = keyTarget && keyTarget.channel !== "agent" ? keyTarget : null;
|
|
19
|
-
const metadata = (normalizedSessionKey ? await this.deps.sessionManager?.getSessionRecord(normalizedSessionKey) : null)?.metadata ?? {};
|
|
20
|
-
const rawContext = metadata.last_delivery_context;
|
|
21
|
-
const cachedContext = rawContext && typeof rawContext === "object" && !Array.isArray(rawContext) ? rawContext : null;
|
|
22
|
-
const cachedMetadataRaw = cachedContext?.metadata;
|
|
23
|
-
const cachedMetadata = cachedMetadataRaw && typeof cachedMetadataRaw === "object" && !Array.isArray(cachedMetadataRaw) ? { ...cachedMetadataRaw } : {};
|
|
24
|
-
const channel = this.normalizeOptionalString(cachedContext?.channel) ?? keyRoute?.channel;
|
|
25
|
-
const chatId = this.normalizeOptionalString(cachedContext?.chatId) ?? this.normalizeOptionalString(metadata.last_to) ?? keyRoute?.chatId;
|
|
26
|
-
const replyTo = this.normalizeOptionalString(cachedContext?.replyTo) ?? this.normalizeOptionalString(metadata.last_message_id);
|
|
27
|
-
const accountId = this.normalizeOptionalString(cachedContext?.accountId) ?? this.normalizeOptionalString(metadata.last_account_id);
|
|
28
|
-
if (!channel || !chatId) return;
|
|
29
|
-
if (accountId && !this.normalizeOptionalString(cachedMetadata.accountId)) cachedMetadata.accountId = accountId;
|
|
30
|
-
return {
|
|
31
|
-
channel,
|
|
32
|
-
chatId,
|
|
33
|
-
...replyTo ? { replyTo } : {},
|
|
34
|
-
...accountId ? { accountId } : {},
|
|
35
|
-
...Object.keys(cachedMetadata).length > 0 ? { metadata: cachedMetadata } : {}
|
|
36
|
-
};
|
|
37
|
-
};
|
|
38
|
-
writeUpdateRestartSentinelPayload = async (params) => {
|
|
39
|
-
const { note, reason, sessionKey: rawSessionKey, status, strategy } = params;
|
|
40
|
-
const sessionKey = this.normalizeOptionalString(rawSessionKey);
|
|
41
|
-
const deliveryContext = await this.resolveDeliveryContext(sessionKey);
|
|
42
|
-
try {
|
|
43
|
-
return await writeRestartSentinel({
|
|
44
|
-
kind: "update.run",
|
|
45
|
-
status,
|
|
46
|
-
ts: Date.now(),
|
|
47
|
-
sessionKey,
|
|
48
|
-
deliveryContext,
|
|
49
|
-
message: note ?? null,
|
|
50
|
-
stats: {
|
|
51
|
-
reason: reason ?? null,
|
|
52
|
-
strategy: strategy ?? null
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
} catch {
|
|
56
|
-
return null;
|
|
57
|
-
}
|
|
58
|
-
};
|
|
59
|
-
requestRestart = async (options) => {
|
|
60
|
-
const { delayMs, reason } = options ?? {};
|
|
61
|
-
if (this.deps.requestRestart) {
|
|
62
|
-
await this.deps.requestRestart(options);
|
|
63
|
-
return;
|
|
64
|
-
}
|
|
65
|
-
const delay = typeof delayMs === "number" && Number.isFinite(delayMs) ? Math.max(0, delayMs) : 100;
|
|
66
|
-
console.log(`Gateway restart requested via tool${reason ? ` (${reason})` : ""}.`);
|
|
67
|
-
setTimeout(() => {
|
|
68
|
-
process.exit(0);
|
|
69
|
-
}, delay);
|
|
70
|
-
};
|
|
71
9
|
getConfig = async () => {
|
|
72
10
|
return this.deps.configManager.getConfigSnapshot({ version: getPackageVersion$1() });
|
|
73
11
|
};
|
|
@@ -90,50 +28,6 @@ var GatewayControllerImpl = class {
|
|
|
90
28
|
version: getPackageVersion$1()
|
|
91
29
|
});
|
|
92
30
|
};
|
|
93
|
-
updateRun = async (params) => {
|
|
94
|
-
const { note, restartDelayMs, sessionKey, timeoutMs } = params;
|
|
95
|
-
const versionBefore = getPackageVersion$1();
|
|
96
|
-
const snapshot = await new NpmRuntimeUpdateCommandService().runManaged({});
|
|
97
|
-
if (snapshot.status === "blocked" || snapshot.status === "failed") return {
|
|
98
|
-
ok: false,
|
|
99
|
-
error: snapshot.errorMessage ?? snapshot.blockReason ?? "update failed",
|
|
100
|
-
snapshot,
|
|
101
|
-
version: {
|
|
102
|
-
before: versionBefore,
|
|
103
|
-
after: getPackageVersion$1(),
|
|
104
|
-
changed: false
|
|
105
|
-
}
|
|
106
|
-
};
|
|
107
|
-
const versionAfter = getPackageVersion$1();
|
|
108
|
-
const delayMs = restartDelayMs ?? 0;
|
|
109
|
-
const sentinelPath = await this.writeUpdateRestartSentinelPayload({
|
|
110
|
-
status: "ok",
|
|
111
|
-
sessionKey,
|
|
112
|
-
note,
|
|
113
|
-
reason: "update.run",
|
|
114
|
-
strategy: "runtime-bundle"
|
|
115
|
-
});
|
|
116
|
-
await this.requestRestart({
|
|
117
|
-
delayMs,
|
|
118
|
-
reason: "update.run"
|
|
119
|
-
});
|
|
120
|
-
return {
|
|
121
|
-
ok: true,
|
|
122
|
-
note: note ?? null,
|
|
123
|
-
restart: {
|
|
124
|
-
scheduled: true,
|
|
125
|
-
delayMs
|
|
126
|
-
},
|
|
127
|
-
strategy: "runtime-bundle",
|
|
128
|
-
snapshot,
|
|
129
|
-
version: {
|
|
130
|
-
before: versionBefore,
|
|
131
|
-
after: versionAfter,
|
|
132
|
-
changed: versionBefore !== versionAfter
|
|
133
|
-
},
|
|
134
|
-
sentinel: sentinelPath ? { path: sentinelPath } : null
|
|
135
|
-
};
|
|
136
|
-
};
|
|
137
31
|
};
|
|
138
32
|
//#endregion
|
|
139
33
|
export { GatewayControllerImpl };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.controller.js","names":["getPackageVersion"],"sources":["../../src/controllers/gateway.controller.ts"],"sourcesContent":["import {\n type GatewayController,\n} from \"@nextclaw/core\";\nimport type { ConfigManager
|
|
1
|
+
{"version":3,"file":"gateway.controller.js","names":["getPackageVersion"],"sources":["../../src/controllers/gateway.controller.ts"],"sourcesContent":["import {\n type GatewayController,\n} from \"@nextclaw/core\";\nimport type { ConfigManager } from \"@nextclaw/kernel\";\nimport { getPackageVersion } from \"../utils/cli.utils.js\";\n\ntype ControllerDeps = {\n configManager: ConfigManager;\n};\n\nexport class GatewayControllerImpl implements GatewayController {\n constructor(private deps: ControllerDeps) {}\n\n getConfig = async (): Promise<Record<string, unknown>> => {\n return this.deps.configManager.getConfigSnapshot({ version: getPackageVersion() });\n };\n\n getConfigSchema = async (): Promise<Record<string, unknown>> => {\n return this.deps.configManager.getConfigSchema({ version: getPackageVersion() });\n };\n\n applyConfig = async (params: {\n raw: string;\n baseHash?: string;\n note?: string;\n }): Promise<Record<string, unknown>> => {\n return this.deps.configManager.applyRawConfig({\n raw: params.raw,\n baseHash: params.baseHash,\n note: params.note,\n version: getPackageVersion()\n });\n };\n\n patchConfig = async (params: {\n raw: string;\n baseHash?: string;\n note?: string;\n }): Promise<Record<string, unknown>> => {\n return this.deps.configManager.patchRawConfig({\n raw: params.raw,\n baseHash: params.baseHash,\n note: params.note,\n version: getPackageVersion()\n });\n };\n\n}\n"],"mappings":";;;;AAUA,IAAa,wBAAb,MAAgE;CAC9D,YAAY,MAA8B;AAAtB,OAAA,OAAA;;CAEpB,YAAY,YAA8C;AACxD,SAAO,KAAK,KAAK,cAAc,kBAAkB,EAAE,SAASA,qBAAmB,EAAE,CAAC;;CAGpF,kBAAkB,YAA8C;AAC9D,SAAO,KAAK,KAAK,cAAc,gBAAgB,EAAE,SAASA,qBAAmB,EAAE,CAAC;;CAGlF,cAAc,OAAO,WAImB;AACtC,SAAO,KAAK,KAAK,cAAc,eAAe;GAC5C,KAAK,OAAO;GACZ,UAAU,OAAO;GACjB,MAAM,OAAO;GACb,SAASA,qBAAmB;GAC7B,CAAC;;CAGJ,cAAc,OAAO,WAImB;AACtC,SAAO,KAAK,KAAK,cAAc,eAAe;GAC5C,KAAK,OAAO;GACZ,UAAU,OAAO;GACjB,MAAM,OAAO;GACb,SAASA,qBAAmB;GAC7B,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { StartServiceOptions } from "../services/runtime/service-managed-startup
|
|
|
3
3
|
import { describeUnmanagedHealthyTargetMessage } from "../utils/service-port-probe.utils.js";
|
|
4
4
|
import { buildMarketplaceSkillInstallArgs, pickUserFacingCommandSummary } from "../utils/marketplace/service-marketplace-helpers.utils.js";
|
|
5
5
|
import * as NextclawCore from "@nextclaw/core";
|
|
6
|
+
import { PlannedRestartRecovery } from "@nextclaw/kernel";
|
|
6
7
|
|
|
7
8
|
//#region src/managers/managed-service.manager.d.ts
|
|
8
9
|
type Config$1 = NextclawCore.Config;
|
|
@@ -15,6 +16,7 @@ declare class ManagedServiceManager {
|
|
|
15
16
|
private readonly managedServiceCommandService;
|
|
16
17
|
constructor(deps: {
|
|
17
18
|
requestRestart: (params: RequestRestartParams) => Promise<void>;
|
|
19
|
+
installPlannedRestartRecovery: (recovery: PlannedRestartRecovery) => void;
|
|
18
20
|
initializeAgentHomeDirectory: (homeDirectory: string) => void;
|
|
19
21
|
});
|
|
20
22
|
startGateway: (options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-service.manager.d.ts","names":[],"sources":["../../src/managers/managed-service.manager.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"managed-service.manager.d.ts","names":[],"sources":["../../src/managers/managed-service.manager.ts"],"mappings":";;;;;;;;KAkBK,QAAA,GAAS,YAAA,CAAa,MAAA;AAAA,cAEd,qBAAA;EAAA,QAaS,IAAA;EAAA,QAZZ,gBAAA;EAAA,QACA,2BAAA;EAAA,iBACS,WAAA;EAAA,iBACA,wBAAA;EAAA,iBACA,4BAAA;cAQG,IAAA;IAClB,cAAA,GAAiB,MAAA,EAAQ,oBAAA,KAAyB,OAAA;IAClD,6BAAA,GAAgC,QAAA,EAAU,sBAAA;IAC1C,4BAAA,GAA+B,aAAA;EAAA;EAGjC,YAAA,GAAsB,OAAA;IAAW,WAAA,GAAc,OAAA,CAAQ,QAAA;IAAe,WAAA;EAAA,MAAqC,OAAA;EAuD3G,YAAA,GAAsB,OAAA,EAAS,mBAAA,KAAsB,OAAA;EAIrD,WAAA,QAAwB,OAAA;EAIxB,aAAA,GAAuB,OAAA;IACrB,WAAA,EAAa,OAAA,CAAQ,QAAA;IACrB,IAAA;EAAA,MACE,OAAA;EAAA,QAII,8BAAA;EAAA,QAUA,kBAAA;EAAA,QAIA,gBAAA;EAAA,QAWA,UAAA;EAAA,QA2CA,6BAAA;EAAA,QAWA,yBAAA;EAAA,QAkBA,oBAAA;EAAA,QA6BA,iBAAA;EAAA,QAoBA,wBAAA;AAAA"}
|
|
@@ -38,6 +38,7 @@ var ManagedServiceManager = class {
|
|
|
38
38
|
runCliSubcommand: this.runCliSubcommand,
|
|
39
39
|
installBuiltinMarketplaceSkill: this.installBuiltinMarketplaceSkill
|
|
40
40
|
}, { ...options });
|
|
41
|
+
this.deps.installPlannedRestartRecovery(gateway.kernel.plannedRestartRecovery);
|
|
41
42
|
this.managedServiceSupervisor.installCurrentProcessLifecycleTracking({ onSignal: async () => await gateway.stop() });
|
|
42
43
|
const correlationId = `serve-${process.pid}`;
|
|
43
44
|
const startedAt = Date.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-service.manager.js","names":["getWorkspacePath","loadConfig"],"sources":["../../src/managers/managed-service.manager.ts"],"sourcesContent":["import * as NextclawCore from \"@nextclaw/core\";\nimport { spawn } from \"node:child_process\";\nimport { SkillManager } from \"@nextclaw/kernel\";\nimport { classifyDiagnosticError } from \"@nextclaw/shared\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { ManagedServiceCommandService, type StartServiceOptions } from \"@nextclaw-service/services/runtime/service-managed-startup.service.js\";\nimport { ManagedServiceSupervisor } from \"@nextclaw-service/services/runtime/managed-service-supervisor.service.js\";\nimport { ServiceGatewayManager } from \"@nextclaw-service/managers/service-gateway.manager.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { describeUnmanagedHealthyTargetMessage, inspectUiTarget } from \"@nextclaw-service/utils/service-port-probe.utils.js\";\nimport { resolveCliSubcommandEntry } from \"@nextclaw-service/utils/marketplace/cli-subcommand-launch.utils.js\";\nimport { isLoopbackHost, resolvePublicIp, resolveUiStaticDir } from \"@nextclaw-service/utils/cli.utils.js\";\nexport { buildMarketplaceSkillInstallArgs, pickUserFacingCommandSummary } from \"@nextclaw-service/utils/marketplace/service-marketplace-helpers.utils.js\";\nexport { describeUnmanagedHealthyTargetMessage };\nconst {\n getWorkspacePath,\n loadConfig,\n} = NextclawCore;\ntype Config = NextclawCore.Config;\n\nexport class ManagedServiceManager {\n private loggingInstalled = false;\n private processExitLoggingInstalled = false;\n private readonly diagnostics = new NextclawCore.DiagnosticRuntime();\n private readonly managedServiceSupervisor = new ManagedServiceSupervisor();\n private readonly managedServiceCommandService = new ManagedServiceCommandService({\n startGateway: async (options) => await this.startGateway(options),\n printPublicUiUrls: async (host, port) => await this.printPublicUiUrls(host, port),\n printServiceControlHints: () => this.printServiceControlHints(),\n checkUiPortPreflight: async (params) => await this.checkUiPortPreflight(params),\n resolveUiStaticDir: () => resolveUiStaticDir(NextclawDistributionService.get().uiDistDir)\n });\n\n constructor(private deps: {\n requestRestart: (params: RequestRestartParams) => Promise<void>;\n initializeAgentHomeDirectory: (homeDirectory: string) => void;\n }) {}\n\n startGateway = async (options: { uiOverrides?: Partial<Config[\"ui\"]>; uiStaticDir?: string | null } = {}): Promise<void> => {\n this.ensureRuntimeLoggingInstalled();\n this.installProcessExitLogging();\n const gateway = new ServiceGatewayManager({\n requestRestart: this.deps.requestRestart,\n initializeAgentHomeDirectory: this.deps.initializeAgentHomeDirectory,\n startService: this.startService,\n stopService: this.stopService,\n runCliSubcommand: this.runCliSubcommand,\n installBuiltinMarketplaceSkill: this.installBuiltinMarketplaceSkill,\n }, {\n ...options\n });\n this.managedServiceSupervisor.installCurrentProcessLifecycleTracking({\n onSignal: async () => await gateway.stop(),\n });\n const correlationId = `serve-${process.pid}`;\n const startedAt = Date.now();\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.started\",\n component: \"service.managed-runtime\",\n outcome: \"started\",\n correlationId,\n facts: { runtimeKind: \"serve-process\", pid: process.pid },\n });\n try {\n await gateway.start();\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.ready\",\n component: \"service.managed-runtime\",\n outcome: \"succeeded\",\n correlationId,\n durationMs: Date.now() - startedAt,\n facts: { runtimeKind: \"serve-process\", pid: process.pid },\n });\n } catch (error) {\n const classification = classifyDiagnosticError(error);\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.start.failed\",\n component: \"service.managed-runtime\",\n outcome: classification.outcome,\n correlationId,\n durationMs: Date.now() - startedAt,\n reasonCode: classification.reasonCode,\n providerCode: classification.providerCode,\n facts: { runtimeKind: \"serve-process\", pid: process.pid, ...(classification.facts ?? {}) },\n });\n throw error;\n }\n };\n\n startService = async (options: StartServiceOptions): Promise<void> => {\n await this.managedServiceCommandService.startService(options);\n };\n\n stopService = async (): Promise<void> => {\n await this.managedServiceCommandService.stopService();\n };\n\n runForeground = async (options: {\n uiOverrides: Partial<Config[\"ui\"]>;\n open: boolean;\n }): Promise<void> => {\n await this.managedServiceCommandService.runForeground(options);\n };\n\n private installBuiltinMarketplaceSkill = (slug: string, _force: boolean | undefined): { message: string; output?: string } | null => {\n const workspace = getWorkspacePath(loadConfig().agents.defaults.workspace);\n if (!new SkillManager({ workspace }).findBuiltinSkill(slug)) {\n return null;\n }\n return {\n message: `${slug} is already available (built-in)`\n };\n };\n\n private mergeCommandOutput = (stdout: string, stderr: string): string => {\n return `${stdout}\\n${stderr}`.trim();\n };\n\n private runCliSubcommand = (args: string[], timeoutMs = 180_000): Promise<string> => {\n const cliEntry = resolveCliSubcommandEntry({\n argvEntry: process.argv[1],\n importMetaUrl: import.meta.url\n });\n return this.runCommand(process.execPath, [...process.execArgv, cliEntry, ...args], {\n cwd: process.cwd(),\n timeoutMs\n }).then((result) => this.mergeCommandOutput(result.stdout, result.stderr));\n };\n\n private runCommand = (command: string, args: string[], options: { cwd?: string; timeoutMs?: number } = {}): Promise<{ stdout: string; stderr: string }> => {\n const timeoutMs = options.timeoutMs ?? 180_000;\n return new Promise((resolvePromise, rejectPromise) => {\n const child = spawn(command, args, {\n cwd: options.cwd ?? process.cwd(),\n env: process.env,\n stdio: [\"ignore\", \"pipe\", \"pipe\"],\n windowsHide: true\n });\n\n let stdout = \"\";\n let stderr = \"\";\n child.stdout?.setEncoding(\"utf-8\");\n child.stderr?.setEncoding(\"utf-8\");\n child.stdout?.on(\"data\", (chunk: string) => {\n stdout += chunk;\n });\n child.stderr?.on(\"data\", (chunk: string) => {\n stderr += chunk;\n });\n\n const timer = setTimeout(() => {\n child.kill(\"SIGTERM\");\n rejectPromise(new Error(`command timed out after ${timeoutMs}ms`));\n }, timeoutMs);\n\n child.on(\"error\", (error) => {\n clearTimeout(timer);\n rejectPromise(new Error(`failed to start command: ${String(error)}`));\n });\n\n child.on(\"close\", (code) => {\n clearTimeout(timer);\n const output = this.mergeCommandOutput(stdout, stderr);\n if (code === 0) {\n resolvePromise({ stdout, stderr });\n return;\n }\n rejectPromise(new Error(output || `command failed with code ${code ?? 1}`));\n });\n });\n };\n\n private ensureRuntimeLoggingInstalled = (): void => {\n if (this.loggingInstalled) {\n return;\n }\n NextclawCore.configureAppLogging({\n installConsoleMirror: true,\n installProcessCrashMonitor: true\n });\n this.loggingInstalled = true;\n };\n\n private installProcessExitLogging = (): void => {\n if (this.processExitLoggingInstalled) {\n return;\n }\n this.processExitLoggingInstalled = true;\n process.once(\"exit\", (code) => {\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.exited\",\n component: \"service.managed-runtime\",\n outcome: code === 0 ? \"succeeded\" : \"failed\",\n correlationId: `serve-${process.pid}`,\n reasonCode: code === 0 ? undefined : \"non_zero_exit\",\n facts: { runtimeKind: \"serve-process\", pid: process.pid, exitCode: code },\n });\n });\n };\n\n private checkUiPortPreflight = async (params: {\n host: string;\n port: number;\n healthUrl: string;\n }): Promise<\n | { ok: true; reusedExistingHealthyTarget: boolean }\n | { ok: false; message: string }\n > => {\n const target = await inspectUiTarget(params);\n if (target.state === \"available\") {\n return { ok: true, reusedExistingHealthyTarget: false };\n }\n if (target.state === \"healthy-existing\") {\n return { ok: true, reusedExistingHealthyTarget: true };\n }\n\n const lines = [`Port probe: ${target.availabilityDetail}`];\n if (target.probeError) {\n lines.push(`Health probe: ${target.probeError}`);\n }\n lines.push(\"The port is occupied by a process that does not answer as a healthy NextClaw HTTP server.\");\n lines.push(`Fix: free port ${params.port} or start NextClaw with another port via --ui-port <port>.`);\n lines.push(`Inspect locally with: ss -ltnp | grep ${params.port} || lsof -iTCP:${params.port} -sTCP:LISTEN -n -P`);\n return {\n ok: false,\n message: lines.join(\"\\n\")\n };\n };\n\n private printPublicUiUrls = async (host: string, port: number): Promise<void> => {\n if (isLoopbackHost(host)) {\n console.log(\"Public URL: disabled (UI host is loopback). Current release expects public exposure; run nextclaw restart.\");\n return;\n }\n\n const publicIp = await resolvePublicIp();\n if (!publicIp) {\n console.log(\"Public URL: UI is exposed, but automatic public IP detection failed.\");\n return;\n }\n\n const publicBase = `http://${publicIp}:${port}`;\n console.log(`Public UI (if firewall/NAT allows): ${publicBase}`);\n console.log(`Public API (if firewall/NAT allows): ${publicBase}/api`);\n console.log(`Public deploy note: NextClaw serves plain HTTP on ${port}.`);\n console.log(`For https:// or standard 80/443 access, terminate TLS in Nginx/Caddy and proxy to http://127.0.0.1:${port}.`);\n console.log(`If a reverse proxy returns 502, verify its upstream is http://127.0.0.1:${port} (not https://, not a stale port, and not a stopped process).`);\n };\n\n private printServiceControlHints = (): void => {\n console.log(\"Service controls:\");\n console.log(\" - Check status: NextClaw status\");\n console.log(\" - If you need to stop the service, run: NextClaw stop\");\n console.log(\" - View log paths: NextClaw logs path\");\n console.log(\" - Tail recent logs: NextClaw logs tail\");\n console.log(\" - Check autostart: NextClaw service autostart status --user\");\n };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"managed-service.manager.js","names":["getWorkspacePath","loadConfig"],"sources":["../../src/managers/managed-service.manager.ts"],"sourcesContent":["import * as NextclawCore from \"@nextclaw/core\";\nimport { spawn } from \"node:child_process\";\nimport { SkillManager, type PlannedRestartRecovery } from \"@nextclaw/kernel\";\nimport { classifyDiagnosticError } from \"@nextclaw/shared\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { ManagedServiceCommandService, type StartServiceOptions } from \"@nextclaw-service/services/runtime/service-managed-startup.service.js\";\nimport { ManagedServiceSupervisor } from \"@nextclaw-service/services/runtime/managed-service-supervisor.service.js\";\nimport { ServiceGatewayManager } from \"@nextclaw-service/managers/service-gateway.manager.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { describeUnmanagedHealthyTargetMessage, inspectUiTarget } from \"@nextclaw-service/utils/service-port-probe.utils.js\";\nimport { resolveCliSubcommandEntry } from \"@nextclaw-service/utils/marketplace/cli-subcommand-launch.utils.js\";\nimport { isLoopbackHost, resolvePublicIp, resolveUiStaticDir } from \"@nextclaw-service/utils/cli.utils.js\";\nexport { buildMarketplaceSkillInstallArgs, pickUserFacingCommandSummary } from \"@nextclaw-service/utils/marketplace/service-marketplace-helpers.utils.js\";\nexport { describeUnmanagedHealthyTargetMessage };\nconst {\n getWorkspacePath,\n loadConfig,\n} = NextclawCore;\ntype Config = NextclawCore.Config;\n\nexport class ManagedServiceManager {\n private loggingInstalled = false;\n private processExitLoggingInstalled = false;\n private readonly diagnostics = new NextclawCore.DiagnosticRuntime();\n private readonly managedServiceSupervisor = new ManagedServiceSupervisor();\n private readonly managedServiceCommandService = new ManagedServiceCommandService({\n startGateway: async (options) => await this.startGateway(options),\n printPublicUiUrls: async (host, port) => await this.printPublicUiUrls(host, port),\n printServiceControlHints: () => this.printServiceControlHints(),\n checkUiPortPreflight: async (params) => await this.checkUiPortPreflight(params),\n resolveUiStaticDir: () => resolveUiStaticDir(NextclawDistributionService.get().uiDistDir)\n });\n\n constructor(private deps: {\n requestRestart: (params: RequestRestartParams) => Promise<void>;\n installPlannedRestartRecovery: (recovery: PlannedRestartRecovery) => void;\n initializeAgentHomeDirectory: (homeDirectory: string) => void;\n }) {}\n\n startGateway = async (options: { uiOverrides?: Partial<Config[\"ui\"]>; uiStaticDir?: string | null } = {}): Promise<void> => {\n this.ensureRuntimeLoggingInstalled();\n this.installProcessExitLogging();\n const gateway = new ServiceGatewayManager({\n requestRestart: this.deps.requestRestart,\n initializeAgentHomeDirectory: this.deps.initializeAgentHomeDirectory,\n startService: this.startService,\n stopService: this.stopService,\n runCliSubcommand: this.runCliSubcommand,\n installBuiltinMarketplaceSkill: this.installBuiltinMarketplaceSkill,\n }, {\n ...options\n });\n this.deps.installPlannedRestartRecovery(gateway.kernel.plannedRestartRecovery);\n this.managedServiceSupervisor.installCurrentProcessLifecycleTracking({\n onSignal: async () => await gateway.stop(),\n });\n const correlationId = `serve-${process.pid}`;\n const startedAt = Date.now();\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.started\",\n component: \"service.managed-runtime\",\n outcome: \"started\",\n correlationId,\n facts: { runtimeKind: \"serve-process\", pid: process.pid },\n });\n try {\n await gateway.start();\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.ready\",\n component: \"service.managed-runtime\",\n outcome: \"succeeded\",\n correlationId,\n durationMs: Date.now() - startedAt,\n facts: { runtimeKind: \"serve-process\", pid: process.pid },\n });\n } catch (error) {\n const classification = classifyDiagnosticError(error);\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.start.failed\",\n component: \"service.managed-runtime\",\n outcome: classification.outcome,\n correlationId,\n durationMs: Date.now() - startedAt,\n reasonCode: classification.reasonCode,\n providerCode: classification.providerCode,\n facts: { runtimeKind: \"serve-process\", pid: process.pid, ...(classification.facts ?? {}) },\n });\n throw error;\n }\n };\n\n startService = async (options: StartServiceOptions): Promise<void> => {\n await this.managedServiceCommandService.startService(options);\n };\n\n stopService = async (): Promise<void> => {\n await this.managedServiceCommandService.stopService();\n };\n\n runForeground = async (options: {\n uiOverrides: Partial<Config[\"ui\"]>;\n open: boolean;\n }): Promise<void> => {\n await this.managedServiceCommandService.runForeground(options);\n };\n\n private installBuiltinMarketplaceSkill = (slug: string, _force: boolean | undefined): { message: string; output?: string } | null => {\n const workspace = getWorkspacePath(loadConfig().agents.defaults.workspace);\n if (!new SkillManager({ workspace }).findBuiltinSkill(slug)) {\n return null;\n }\n return {\n message: `${slug} is already available (built-in)`\n };\n };\n\n private mergeCommandOutput = (stdout: string, stderr: string): string => {\n return `${stdout}\\n${stderr}`.trim();\n };\n\n private runCliSubcommand = (args: string[], timeoutMs = 180_000): Promise<string> => {\n const cliEntry = resolveCliSubcommandEntry({\n argvEntry: process.argv[1],\n importMetaUrl: import.meta.url\n });\n return this.runCommand(process.execPath, [...process.execArgv, cliEntry, ...args], {\n cwd: process.cwd(),\n timeoutMs\n }).then((result) => this.mergeCommandOutput(result.stdout, result.stderr));\n };\n\n private runCommand = (command: string, args: string[], options: { cwd?: string; timeoutMs?: number } = {}): Promise<{ stdout: string; stderr: string }> => {\n const timeoutMs = options.timeoutMs ?? 180_000;\n return new Promise((resolvePromise, rejectPromise) => {\n const child = spawn(command, args, {\n cwd: options.cwd ?? process.cwd(),\n env: process.env,\n stdio: [\"ignore\", \"pipe\", \"pipe\"],\n windowsHide: true\n });\n\n let stdout = \"\";\n let stderr = \"\";\n child.stdout?.setEncoding(\"utf-8\");\n child.stderr?.setEncoding(\"utf-8\");\n child.stdout?.on(\"data\", (chunk: string) => {\n stdout += chunk;\n });\n child.stderr?.on(\"data\", (chunk: string) => {\n stderr += chunk;\n });\n\n const timer = setTimeout(() => {\n child.kill(\"SIGTERM\");\n rejectPromise(new Error(`command timed out after ${timeoutMs}ms`));\n }, timeoutMs);\n\n child.on(\"error\", (error) => {\n clearTimeout(timer);\n rejectPromise(new Error(`failed to start command: ${String(error)}`));\n });\n\n child.on(\"close\", (code) => {\n clearTimeout(timer);\n const output = this.mergeCommandOutput(stdout, stderr);\n if (code === 0) {\n resolvePromise({ stdout, stderr });\n return;\n }\n rejectPromise(new Error(output || `command failed with code ${code ?? 1}`));\n });\n });\n };\n\n private ensureRuntimeLoggingInstalled = (): void => {\n if (this.loggingInstalled) {\n return;\n }\n NextclawCore.configureAppLogging({\n installConsoleMirror: true,\n installProcessCrashMonitor: true\n });\n this.loggingInstalled = true;\n };\n\n private installProcessExitLogging = (): void => {\n if (this.processExitLoggingInstalled) {\n return;\n }\n this.processExitLoggingInstalled = true;\n process.once(\"exit\", (code) => {\n this.diagnostics.record({\n domain: \"runtime.lifecycle\",\n event: \"process.exited\",\n component: \"service.managed-runtime\",\n outcome: code === 0 ? \"succeeded\" : \"failed\",\n correlationId: `serve-${process.pid}`,\n reasonCode: code === 0 ? undefined : \"non_zero_exit\",\n facts: { runtimeKind: \"serve-process\", pid: process.pid, exitCode: code },\n });\n });\n };\n\n private checkUiPortPreflight = async (params: {\n host: string;\n port: number;\n healthUrl: string;\n }): Promise<\n | { ok: true; reusedExistingHealthyTarget: boolean }\n | { ok: false; message: string }\n > => {\n const target = await inspectUiTarget(params);\n if (target.state === \"available\") {\n return { ok: true, reusedExistingHealthyTarget: false };\n }\n if (target.state === \"healthy-existing\") {\n return { ok: true, reusedExistingHealthyTarget: true };\n }\n\n const lines = [`Port probe: ${target.availabilityDetail}`];\n if (target.probeError) {\n lines.push(`Health probe: ${target.probeError}`);\n }\n lines.push(\"The port is occupied by a process that does not answer as a healthy NextClaw HTTP server.\");\n lines.push(`Fix: free port ${params.port} or start NextClaw with another port via --ui-port <port>.`);\n lines.push(`Inspect locally with: ss -ltnp | grep ${params.port} || lsof -iTCP:${params.port} -sTCP:LISTEN -n -P`);\n return {\n ok: false,\n message: lines.join(\"\\n\")\n };\n };\n\n private printPublicUiUrls = async (host: string, port: number): Promise<void> => {\n if (isLoopbackHost(host)) {\n console.log(\"Public URL: disabled (UI host is loopback). Current release expects public exposure; run nextclaw restart.\");\n return;\n }\n\n const publicIp = await resolvePublicIp();\n if (!publicIp) {\n console.log(\"Public URL: UI is exposed, but automatic public IP detection failed.\");\n return;\n }\n\n const publicBase = `http://${publicIp}:${port}`;\n console.log(`Public UI (if firewall/NAT allows): ${publicBase}`);\n console.log(`Public API (if firewall/NAT allows): ${publicBase}/api`);\n console.log(`Public deploy note: NextClaw serves plain HTTP on ${port}.`);\n console.log(`For https:// or standard 80/443 access, terminate TLS in Nginx/Caddy and proxy to http://127.0.0.1:${port}.`);\n console.log(`If a reverse proxy returns 502, verify its upstream is http://127.0.0.1:${port} (not https://, not a stale port, and not a stopped process).`);\n };\n\n private printServiceControlHints = (): void => {\n console.log(\"Service controls:\");\n console.log(\" - Check status: NextClaw status\");\n console.log(\" - If you need to stop the service, run: NextClaw stop\");\n console.log(\" - View log paths: NextClaw logs path\");\n console.log(\" - Tail recent logs: NextClaw logs tail\");\n console.log(\" - Check autostart: NextClaw service autostart status --user\");\n };\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-gateway.manager.d.ts","names":[],"sources":["../../src/managers/service-gateway.manager.ts"],"mappings":";;;;;;;;;;;;;;;;;;KAqEK,QAAA,GAAS,YAAA,CAAa,MAAA;AAAA,KACtB,UAAA,GAAa,YAAA,CAAa,UAAA;AAAA,KAE1B,qBAAA;EACH,WAAA,GAAc,OAAA,CAAQ,QAAA;EACtB,WAAA;AAAA;AAAA,KAGU,kBAAA;EACV,cAAA,GAAiB,MAAA,EAAQ,oBAAA,KAAyB,OAAA;EAClD,4BAAA,GAA+B,aAAA;EAC/B,YAAA,GAAe,OAAA;IAAW,WAAA,EAAa,MAAA;IAAyB,IAAA;EAAA,MAAoB,OAAA;EACpF,WAAA,QAAmB,OAAA;EACnB,gBAAA,GAAmB,IAAA,eAAmB,OAAA;EACtC,8BAAA,GAAiC,IAAA,UAAc,KAAA;IAAiC,OAAA;IAAiB,MAAA;EAAA;AAAA;AAAA,cAGtF,qBAAA;EAAA,iBA+BQ,IAAA;EAAA,iBACA,OAAA;EAAA,SA/BV,MAAA,EAAQ,cAAA;EAAA,SACR,WAAA,EAAW,uBAAA;EAAA,SACX,WAAA,EAAa,QAAA;EAAA,SACb,UAAA,EAAY,UAAA;EAAA,SACZ,cAAA,EAAgB,cAAA;EAAA,SAChB,UAAA,EAAY,iBAAA;EAAA,SACZ,cAAA,EAAgB,cAAA;EAAA,SAChB,cAAA,EAAgB,oBAAA;EAAA,SAChB,aAAA,EAAe,oBAAA;EAAA,SACf,OAAA,EAAS,OAAA;EAAA,SACT,YAAA,EADgB,oBAAA;EAAA,SAEhB,cAAA;EAAA,SACA,eAAA,EAAiB,kBAAA;EAAA,SACjB,iBAAA,EAAmB,qBAAA;EAAA,SACnB,uBAAA,EAAyB,uBAAA;EAAA,SAEzB,aAAA,EAAe,aAAA;EAAA,SACf,QAAA,EAAU,QAAA;EAAA,SACV,WAAA;EAAA,SACA,SAAA;EAAA,SACA,aAAA,EAAe,oBAAA;EAAA,SACf,WAAA,EAAa,oBAAA;EAAA,SACb,UAAA,EAAY,uBAAA;EAAA,SACZ,WAAA,EAAa,yBAAA;EACtB,eAAA,EAAiB,2BAAA;EACjB,SAAA,EAAW,eAAA;EAAA,SACF,YAAA,EAAY,0BAAA;EAAA,QACb,sBAAA;cAGW,IAAA,EAAM,kBAAA,EACN,OAAA,EAAS,qBAAA;EA8E5B,KAAA,QAAkB,OAAA;EAAA,QAcV,KAAA;EAAA,QAOA,qBAAA;EAAA,QAOA,uBAAA;EAAA,QAIA,cAAA;EAAA,QAiCA,qBAAA;EAAA,QAoBA,cAAA;EAAA,QAmBA,oBAAA;EAAA,SAKC,qBAAA,QAAkC,OAAA;EAAA,iBAI1B,aAAA;EAAA,QAWT,iBAAA;EAAA,SASC,IAAA,QAAiB,OAAA;EAAA,QASlB,kBAAA;EAAA,QAKA,uBAAA;EAAA,
|
|
1
|
+
{"version":3,"file":"service-gateway.manager.d.ts","names":[],"sources":["../../src/managers/service-gateway.manager.ts"],"mappings":";;;;;;;;;;;;;;;;;;KAqEK,QAAA,GAAS,YAAA,CAAa,MAAA;AAAA,KACtB,UAAA,GAAa,YAAA,CAAa,UAAA;AAAA,KAE1B,qBAAA;EACH,WAAA,GAAc,OAAA,CAAQ,QAAA;EACtB,WAAA;AAAA;AAAA,KAGU,kBAAA;EACV,cAAA,GAAiB,MAAA,EAAQ,oBAAA,KAAyB,OAAA;EAClD,4BAAA,GAA+B,aAAA;EAC/B,YAAA,GAAe,OAAA;IAAW,WAAA,EAAa,MAAA;IAAyB,IAAA;EAAA,MAAoB,OAAA;EACpF,WAAA,QAAmB,OAAA;EACnB,gBAAA,GAAmB,IAAA,eAAmB,OAAA;EACtC,8BAAA,GAAiC,IAAA,UAAc,KAAA;IAAiC,OAAA;IAAiB,MAAA;EAAA;AAAA;AAAA,cAGtF,qBAAA;EAAA,iBA+BQ,IAAA;EAAA,iBACA,OAAA;EAAA,SA/BV,MAAA,EAAQ,cAAA;EAAA,SACR,WAAA,EAAW,uBAAA;EAAA,SACX,WAAA,EAAa,QAAA;EAAA,SACb,UAAA,EAAY,UAAA;EAAA,SACZ,cAAA,EAAgB,cAAA;EAAA,SAChB,UAAA,EAAY,iBAAA;EAAA,SACZ,cAAA,EAAgB,cAAA;EAAA,SAChB,cAAA,EAAgB,oBAAA;EAAA,SAChB,aAAA,EAAe,oBAAA;EAAA,SACf,OAAA,EAAS,OAAA;EAAA,SACT,YAAA,EADgB,oBAAA;EAAA,SAEhB,cAAA;EAAA,SACA,eAAA,EAAiB,kBAAA;EAAA,SACjB,iBAAA,EAAmB,qBAAA;EAAA,SACnB,uBAAA,EAAyB,uBAAA;EAAA,SAEzB,aAAA,EAAe,aAAA;EAAA,SACf,QAAA,EAAU,QAAA;EAAA,SACV,WAAA;EAAA,SACA,SAAA;EAAA,SACA,aAAA,EAAe,oBAAA;EAAA,SACf,WAAA,EAAa,oBAAA;EAAA,SACb,UAAA,EAAY,uBAAA;EAAA,SACZ,WAAA,EAAa,yBAAA;EACtB,eAAA,EAAiB,2BAAA;EACjB,SAAA,EAAW,eAAA;EAAA,SACF,YAAA,EAAY,0BAAA;EAAA,QACb,sBAAA;cAGW,IAAA,EAAM,kBAAA,EACN,OAAA,EAAS,qBAAA;EA8E5B,KAAA,QAAkB,OAAA;EAAA,QAcV,KAAA;EAAA,QAOA,qBAAA;EAAA,QAOA,uBAAA;EAAA,QAIA,cAAA;EAAA,QAiCA,qBAAA;EAAA,QAoBA,cAAA;EAAA,QAmBA,oBAAA;EAAA,SAKC,qBAAA,QAAkC,OAAA;EAAA,iBAI1B,aAAA;EAAA,QAWT,iBAAA;EAAA,SASC,IAAA,QAAiB,OAAA;EAAA,QASlB,kBAAA;EAAA,QAKA,uBAAA;EAAA,QASA,oBAAA;EAAA,QAgBA,sBAAA;EAAA,QAiBA,wBAAA;AAAA"}
|
|
@@ -255,19 +255,7 @@ var ServiceGatewayManager = class {
|
|
|
255
255
|
await setImmediate();
|
|
256
256
|
};
|
|
257
257
|
createGatewayController = () => {
|
|
258
|
-
return measureStartupSync("service.gateway.gateway_controller", () => new GatewayControllerImpl({
|
|
259
|
-
configManager: this.configManager,
|
|
260
|
-
sessionManager: this.sessionManager,
|
|
261
|
-
requestRestart: async (options) => {
|
|
262
|
-
await this.deps.requestRestart({
|
|
263
|
-
reason: options?.reason ?? "gateway update relaunch",
|
|
264
|
-
manualMessage: "Run nextclaw restart in an external terminal.",
|
|
265
|
-
strategy: "background-service-or-exit",
|
|
266
|
-
delayMs: options?.delayMs,
|
|
267
|
-
silentOnServiceRestart: true
|
|
268
|
-
});
|
|
269
|
-
}
|
|
270
|
-
}));
|
|
258
|
+
return measureStartupSync("service.gateway.gateway_controller", () => new GatewayControllerImpl({ configManager: this.configManager }));
|
|
271
259
|
};
|
|
272
260
|
startSupportServices = async () => {
|
|
273
261
|
this.extensions.publishConfigChanges();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-gateway.manager.js","names":["getConfigPath","getDataDir","getWorkspacePath","waitForNextTick"],"sources":["../../src/managers/service-gateway.manager.ts"],"sourcesContent":["import * as NextclawCore from \"@nextclaw/core\";\nimport {\n AgentRunClient,\n NextclawKernel,\n resolveAutomaticUpdateCheckIntervalMs,\n runGatewayInboundLoop,\n type AutomationManager,\n type ConfigManager,\n type LlmProviderManager,\n type SessionManager,\n} from \"@nextclaw/kernel\";\nimport type { EventBus, Ingress } from \"@nextclaw/shared\";\nimport {\n startUiServer,\n type MarketplaceApiConfig,\n type UiRouterOptions,\n type UiRuntimeControlHost,\n} from \"@nextclaw/server\";\nimport { resolve } from \"node:path\";\nimport { setImmediate as waitForNextTick } from \"node:timers/promises\";\nimport { GatewayControllerImpl } from \"@nextclaw-service/controllers/gateway.controller.js\";\nimport { GatewayExtensionManager } from \"@nextclaw-service/managers/gateway-extension.manager.js\";\nimport { GatewayRemoteManager } from \"@nextclaw-service/managers/gateway-remote.manager.js\";\nimport { GatewayRestartWakeService } from \"@nextclaw-service/services/gateway/gateway-restart-wake.service.js\";\nimport { createCronJobHandler } from \"@nextclaw-service/utils/gateway-cron-job-handler.utils.js\";\nimport { companionRuntimeService } from \"@nextclaw-service/services/ui/companion-runtime.service.js\";\nimport { handleGatewayDeferredStartupError } from \"@nextclaw-service/utils/gateway-runtime-lifecycle.utils.js\";\nimport { NextclawApp, type UiStartupHandle } from \"@nextclaw-service/services/gateway/nextclaw-app.service.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { ServiceBootstrapStatusStore } from \"@nextclaw-service/services/gateway/service-bootstrap-status.service.js\";\nimport { GatewayRuntimeSupportService, ServiceFileWatcherRegistry, markLocalUiRuntimeIfStarted, watchServiceConfigFile } from \"@nextclaw-service/services/gateway/service-startup-support.service.js\";\nimport { ServiceMarketplaceInstaller } from \"@nextclaw-service/services/marketplace/service-marketplace-installer.service.js\";\nimport { ProductActivityReporter } from \"@nextclaw-service/services/product-activity/product-activity-reporter.service.js\";\nimport { MacosDesktopHostService } from \"@nextclaw-service/services/desktop/macos-desktop-host.service.js\";\nimport {\n NpmRuntimeUpdateHost,\n resolveNpmRuntimeUpdateApplyRestartMode,\n} from \"@nextclaw-service/services/runtime/npm-runtime-update-host.service.js\";\nimport { createRuntimeControlHost } from \"@nextclaw-service/services/ui/runtime-control-host.service.js\";\nimport { localUiRuntimeStore } from \"@nextclaw-service/stores/local-ui-runtime.store.js\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { openBrowser, resolveUiConfig, resolveUiStaticDir } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { readPanelAppClientSdkScript } from \"@nextclaw-service/utils/panel-app-client-sdk/panel-app-client-sdk-script.utils.js\";\nimport { logStartupTrace, measureStartupAsync, measureStartupSync } from \"@nextclaw-service/utils/startup-trace.utils.js\";\n\nconst {\n getConfigPath,\n getDataDir,\n getWorkspacePath,\n} = NextclawCore;\n\nfunction resolveApplyRestartMode(uiPort: number) {\n const distribution = NextclawDistributionService.get();\n const resolution = resolveNpmRuntimeUpdateApplyRestartMode({\n currentPid: process.pid,\n env: process.env,\n launchedByLauncher: distribution.launchedByLauncher,\n serviceState: managedServiceStateStore.read(),\n uiPort,\n });\n if (resolution.source === \"legacy-systemd-invocation\") {\n console.warn(\n \"Detected a legacy systemd service without NEXTCLAW_PROCESS_SUPERVISOR; runtime updates will use supervisor-owned relaunch.\",\n );\n }\n return resolution.mode;\n}\n\ntype Config = NextclawCore.Config;\ntype MessageBus = NextclawCore.MessageBus;\n\ntype GatewayRuntimeOptions = {\n uiOverrides?: Partial<Config[\"ui\"]>;\n uiStaticDir?: string | null;\n};\n\nexport type GatewayRuntimeDeps = {\n requestRestart: (params: RequestRestartParams) => Promise<void>;\n initializeAgentHomeDirectory: (homeDirectory: string) => void;\n startService: (options: { uiOverrides: Record<string, unknown>; open: boolean }) => Promise<void>;\n stopService: () => Promise<void>;\n runCliSubcommand: (args: string[]) => Promise<string>;\n installBuiltinMarketplaceSkill: (slug: string, force: boolean | undefined) => { message: string; output?: string } | null;\n};\n\nexport class ServiceGatewayManager {\n readonly kernel: NextclawKernel;\n readonly desktopHost = new MacosDesktopHostService();\n readonly appEventBus: EventBus;\n readonly messageBus: MessageBus;\n readonly sessionManager: SessionManager;\n readonly automation: AutomationManager;\n readonly agentRunClient: AgentRunClient;\n readonly runtimeControl: UiRuntimeControlHost;\n readonly runtimeUpdate: NpmRuntimeUpdateHost | null;\n readonly ingress: Ingress;\n readonly distribution = NextclawDistributionService.get();\n readonly productVersion: string;\n readonly providerManager: LlmProviderManager;\n readonly gatewayController: GatewayControllerImpl;\n readonly productActivityReporter: ProductActivityReporter;\n\n readonly configManager: ConfigManager;\n readonly uiConfig: Config[\"ui\"];\n readonly uiStaticDir: string | null;\n readonly workspace: string;\n readonly remoteManager: GatewayRemoteManager;\n readonly marketplace: MarketplaceApiConfig;\n readonly extensions: GatewayExtensionManager;\n readonly restartWake: GatewayRestartWakeService;\n bootstrapStatus: ServiceBootstrapStatusStore;\n uiStartup: UiStartupHandle;\n readonly fileWatchers = new ServiceFileWatcherRegistry();\n private deferredChannelStarter: () => Promise<void>;\n\n constructor(\n private readonly deps: GatewayRuntimeDeps,\n private readonly options: GatewayRuntimeOptions,\n ) {\n const configPath = getConfigPath();\n const homeDir = getDataDir();\n this.productActivityReporter = new ProductActivityReporter({\n homeDir,\n productVersion: this.distribution.version,\n environment: this.distribution.productEnvironment,\n releaseChannel: this.distribution.releaseChannel,\n loadConfig: () => NextclawCore.loadConfig(configPath),\n });\n this.kernel = measureStartupSync(\n \"service.gateway.kernel\",\n () => new NextclawKernel({\n homeDir,\n configPath,\n builtInAppsDirectory: this.distribution.builtInAppsDirectory,\n portableServiceRunnerPath: this.distribution.portableServiceRunnerPath,\n productVersion: this.distribution.version,\n runtimeVersion: this.distribution.version,\n productActivitySink: this.productActivityReporter,\n desktopHost: this.desktopHost,\n }),\n );\n this.configManager = this.kernel.configManager;\n const config = this.configManager.config;\n this.uiConfig = resolveUiConfig(config, options.uiOverrides);\n this.uiStaticDir = options.uiStaticDir === undefined ? resolveUiStaticDir(this.distribution.uiDistDir) : options.uiStaticDir;\n this.workspace = getWorkspacePath(config.agents.defaults.workspace);\n this.appEventBus = this.kernel.eventBus;\n this.ingress = this.kernel.ingress;\n this.agentRunClient = new AgentRunClient({\n eventBus: this.kernel.eventBus,\n ingress: this.kernel.ingress,\n });\n this.messageBus = this.kernel.messageBus;\n this.sessionManager = this.kernel.sessionManager;\n this.automation = this.kernel.automation;\n this.productVersion = this.distribution.version;\n this.extensions = new GatewayExtensionManager(this);\n this.providerManager = this.kernel.llmProviders;\n this.installConfigHostHooks();\n this.restartWake = new GatewayRestartWakeService(this);\n this.bootstrapStatus = this.createBootstrapStatus();\n this.uiStartup = this.createDisabledUiStartup();\n this.remoteManager = new GatewayRemoteManager({\n deps: this.deps,\n configManager: this.configManager,\n uiConfig: this.uiConfig,\n onRemoteStateChange: (state) => this.bootstrapStatus.syncRemoteRuntimeState(state),\n });\n this.marketplace = this.createMarketplace();\n this.runtimeControl = createRuntimeControlHost({\n serviceCommands: this.deps,\n requestRestart: this.deps.requestRestart,\n uiConfig: this.uiConfig,\n });\n this.runtimeUpdate =\n process.env.NEXTCLAW_DISABLE_RUNTIME_UPDATE_HOST === \"1\"\n ? null\n : new NpmRuntimeUpdateHost({\n eventBus: this.appEventBus,\n applyRestartMode: resolveApplyRestartMode(this.uiConfig.port),\n requestRestart: this.deps.requestRestart,\n uiConfig: this.uiConfig,\n automaticCheckIntervalMs: resolveAutomaticUpdateCheckIntervalMs({\n verificationMode: process.env.NEXTCLAW_UPDATE_VERIFICATION_MODE === \"1\",\n verificationIntervalMs: process.env.NEXTCLAW_UPDATE_VERIFICATION_INTERVAL_MS,\n }),\n });\n this.gatewayController = this.createGatewayController();\n this.kernel.provideGatewayController(this.gatewayController);\n this.deferredChannelStarter = this.startChannels;\n this.automation.onJob = createCronJobHandler({\n agentRunClient: this.agentRunClient,\n });\n }\n\n start = async (): Promise<void> => {\n logStartupTrace(\"service.start_gateway.begin\");\n await this.reset();\n this.runtimeUpdate?.start();\n this.configureIngressHandlers();\n this.uiStartup = await this.startUiRuntime();\n await companionRuntimeService.applyConfig(this.configManager.config);\n await this.markUiRuntimeReady();\n await this.startSupportServices();\n await this.runRuntimeLoop();\n await companionRuntimeService.ensureStopped();\n logStartupTrace(\"service.start_gateway.end\");\n };\n\n private reset = async (): Promise<void> => {\n await this.fileWatchers.clear();\n this.bootstrapStatus = this.createBootstrapStatus();\n this.uiStartup = this.createDisabledUiStartup();\n this.deferredChannelStarter = this.startChannels;\n };\n\n private createBootstrapStatus = (): ServiceBootstrapStatusStore => {\n const bootstrapStatus = new ServiceBootstrapStatusStore();\n bootstrapStatus.markChannelsPending();\n bootstrapStatus.setRemoteState(this.configManager.config.remote.enabled ? \"pending\" : \"disabled\");\n return bootstrapStatus;\n };\n\n private createDisabledUiStartup = (): UiStartupHandle => ({\n endpoint: \"\",\n });\n\n private startUiRuntime = async (): Promise<UiStartupHandle> => {\n const uiStartup = await measureStartupAsync(\"service.start_ui_runtime\", async () => {\n logStartupTrace(\"service.start_ui_runtime.begin\");\n if (!this.uiConfig.enabled) {\n return this.createDisabledUiStartup();\n }\n const uiServer = await startUiServer(this.createUiRouterOptions());\n const uiUrl = NextclawCore.resolveLocalUiBaseUrl({\n host: uiServer.host,\n port: uiServer.port,\n });\n console.log(`✓ UI API: ${uiUrl}/api`);\n if (this.uiStaticDir) {\n console.log(`✓ UI frontend: ${uiUrl}`);\n }\n if (this.uiConfig.open) {\n openBrowser(uiUrl);\n }\n logStartupTrace(\"service.start_ui_runtime.ready\", {\n host: uiServer.host,\n port: uiServer.port,\n });\n return {\n endpoint: uiUrl,\n };\n });\n markLocalUiRuntimeIfStarted({\n uiStartup: this.uiConfig.enabled ? uiStartup : null,\n uiConfig: this.uiConfig,\n });\n return uiStartup;\n };\n\n private createUiRouterOptions = (): UiRouterOptions => ({\n kernel: this.kernel,\n configPath: this.configManager.configPath,\n appEventBus: this.appEventBus,\n uiConfig: this.uiConfig,\n uiStaticDir: this.uiStaticDir,\n panelAppClientSdkScript: readPanelAppClientSdkScript,\n productVersion: this.productVersion,\n applyLiveConfigReload: this.configManager.applyLiveConfigReload,\n initializeAgentHomeDirectory: this.deps.initializeAgentHomeDirectory,\n marketplace: this.marketplace,\n cron: this.automation,\n remoteAccess: this.remoteManager.remoteAccess,\n runtimeControl: this.runtimeControl,\n ...(this.runtimeUpdate ? { runtimeUpdate: this.runtimeUpdate } : {}),\n bootstrapStatus: this.bootstrapStatus,\n extensions: this.extensions,\n productActivity: this.productActivityReporter,\n });\n\n private runRuntimeLoop = async (): Promise<void> => {\n logStartupTrace(\"service.start_gateway.runtime_loop_begin\");\n let startupTask: Promise<void> | null = null;\n try {\n const runtimeLoopTask = runGatewayInboundLoop(this);\n startupTask = this.startDeferredRuntime();\n void startupTask.catch((error) => handleGatewayDeferredStartupError({\n bootstrapStatus: this.bootstrapStatus,\n error,\n }));\n await runtimeLoopTask;\n } finally {\n if (startupTask) {\n await startupTask.catch(() => undefined);\n }\n await this.stop();\n }\n };\n\n private startDeferredRuntime = async (): Promise<void> => {\n const app = new NextclawApp(this);\n await app.start();\n };\n\n readonly startDeferredChannels = async (): Promise<void> => {\n await this.deferredChannelStarter();\n };\n\n private readonly startChannels = async (): Promise<void> => {\n await this.kernel.channels.start();\n const enabledChannels = this.kernel.channels.enabledChannels;\n if (enabledChannels.length > 0) {\n console.log(`✓ Channels enabled: ${enabledChannels.join(\", \")}`);\n } else {\n console.log(\"Warning: No channels enabled\");\n }\n this.bootstrapStatus.markChannelsReady(enabledChannels);\n };\n\n private createMarketplace = (): MarketplaceApiConfig => ({\n apiBaseUrl: process.env.NEXTCLAW_MARKETPLACE_API_BASE,\n installer: new ServiceMarketplaceInstaller({\n applyLiveConfigReload: this.configManager.applyLiveConfigReload,\n runCliSubcommand: this.deps.runCliSubcommand,\n installBuiltinSkill: this.deps.installBuiltinMarketplaceSkill,\n }).createInstaller(),\n });\n\n readonly stop = async (): Promise<void> => {\n localUiRuntimeStore.clearIfOwnedByProcess();\n this.runtimeUpdate?.dispose();\n await this.fileWatchers.clear();\n await this.kernel.extensions.stop();\n await this.desktopHost.dispose();\n await this.remoteManager.stop();\n };\n\n private markUiRuntimeReady = async (): Promise<void> => {\n this.bootstrapStatus.markShellReady();\n await waitForNextTick();\n };\n\n private createGatewayController = (): GatewayControllerImpl => {\n return measureStartupSync(\n \"service.gateway.gateway_controller\",\n () => new GatewayControllerImpl({\n configManager: this.configManager,\n sessionManager: this.sessionManager,\n requestRestart: async (options) => {\n await this.deps.requestRestart({\n reason: options?.reason ?? \"gateway update relaunch\",\n manualMessage: \"Run nextclaw restart in an external terminal.\",\n strategy: \"background-service-or-exit\",\n delayMs: options?.delayMs,\n silentOnServiceRestart: true,\n });\n },\n })\n );\n };\n\n private startSupportServices = async (): Promise<void> => {\n this.extensions.publishConfigChanges();\n await measureStartupAsync(\"service.start_gateway_support_services\", async () =>\n await new GatewayRuntimeSupportService({\n automation: this.automation,\n remoteModule: this.remoteManager.remoteModule,\n watchConfigFile: () => watchServiceConfigFile({\n configPath: resolve(getConfigPath()),\n watcherRegistry: this.fileWatchers,\n scheduleReload: (reason) => this.configManager.scheduleReload(reason)\n }),\n watcherRegistry: this.fileWatchers\n }).start()\n );\n };\n\n private installConfigHostHooks = (): void => {\n this.configManager.installRuntimeHooks({\n reloadCompanion: async ({ config: nextConfig }) => {\n await companionRuntimeService.applyConfig(nextConfig);\n },\n onRestartRequired: (paths) => {\n void this.deps.requestRestart({\n changedPaths: paths,\n manualMessage: `已保存以下改动,请在外部终端运行 nextclaw restart 后生效:${paths.join(\", \")}`,\n mode: \"notify\",\n reason: `config reload requires restart: ${paths.join(\", \")}`,\n strategy: \"background-service-or-manual\",\n });\n },\n });\n };\n\n private configureIngressHandlers = (): void => {\n this.kernel.extensions.registerIngressHandlers();\n };\n\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service-gateway.manager.js","names":["getConfigPath","getDataDir","getWorkspacePath","waitForNextTick"],"sources":["../../src/managers/service-gateway.manager.ts"],"sourcesContent":["import * as NextclawCore from \"@nextclaw/core\";\nimport {\n AgentRunClient,\n NextclawKernel,\n resolveAutomaticUpdateCheckIntervalMs,\n runGatewayInboundLoop,\n type AutomationManager,\n type ConfigManager,\n type LlmProviderManager,\n type SessionManager,\n} from \"@nextclaw/kernel\";\nimport type { EventBus, Ingress } from \"@nextclaw/shared\";\nimport {\n startUiServer,\n type MarketplaceApiConfig,\n type UiRouterOptions,\n type UiRuntimeControlHost,\n} from \"@nextclaw/server\";\nimport { resolve } from \"node:path\";\nimport { setImmediate as waitForNextTick } from \"node:timers/promises\";\nimport { GatewayControllerImpl } from \"@nextclaw-service/controllers/gateway.controller.js\";\nimport { GatewayExtensionManager } from \"@nextclaw-service/managers/gateway-extension.manager.js\";\nimport { GatewayRemoteManager } from \"@nextclaw-service/managers/gateway-remote.manager.js\";\nimport { GatewayRestartWakeService } from \"@nextclaw-service/services/gateway/gateway-restart-wake.service.js\";\nimport { createCronJobHandler } from \"@nextclaw-service/utils/gateway-cron-job-handler.utils.js\";\nimport { companionRuntimeService } from \"@nextclaw-service/services/ui/companion-runtime.service.js\";\nimport { handleGatewayDeferredStartupError } from \"@nextclaw-service/utils/gateway-runtime-lifecycle.utils.js\";\nimport { NextclawApp, type UiStartupHandle } from \"@nextclaw-service/services/gateway/nextclaw-app.service.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { ServiceBootstrapStatusStore } from \"@nextclaw-service/services/gateway/service-bootstrap-status.service.js\";\nimport { GatewayRuntimeSupportService, ServiceFileWatcherRegistry, markLocalUiRuntimeIfStarted, watchServiceConfigFile } from \"@nextclaw-service/services/gateway/service-startup-support.service.js\";\nimport { ServiceMarketplaceInstaller } from \"@nextclaw-service/services/marketplace/service-marketplace-installer.service.js\";\nimport { ProductActivityReporter } from \"@nextclaw-service/services/product-activity/product-activity-reporter.service.js\";\nimport { MacosDesktopHostService } from \"@nextclaw-service/services/desktop/macos-desktop-host.service.js\";\nimport {\n NpmRuntimeUpdateHost,\n resolveNpmRuntimeUpdateApplyRestartMode,\n} from \"@nextclaw-service/services/runtime/npm-runtime-update-host.service.js\";\nimport { createRuntimeControlHost } from \"@nextclaw-service/services/ui/runtime-control-host.service.js\";\nimport { localUiRuntimeStore } from \"@nextclaw-service/stores/local-ui-runtime.store.js\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { openBrowser, resolveUiConfig, resolveUiStaticDir } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { readPanelAppClientSdkScript } from \"@nextclaw-service/utils/panel-app-client-sdk/panel-app-client-sdk-script.utils.js\";\nimport { logStartupTrace, measureStartupAsync, measureStartupSync } from \"@nextclaw-service/utils/startup-trace.utils.js\";\n\nconst {\n getConfigPath,\n getDataDir,\n getWorkspacePath,\n} = NextclawCore;\n\nfunction resolveApplyRestartMode(uiPort: number) {\n const distribution = NextclawDistributionService.get();\n const resolution = resolveNpmRuntimeUpdateApplyRestartMode({\n currentPid: process.pid,\n env: process.env,\n launchedByLauncher: distribution.launchedByLauncher,\n serviceState: managedServiceStateStore.read(),\n uiPort,\n });\n if (resolution.source === \"legacy-systemd-invocation\") {\n console.warn(\n \"Detected a legacy systemd service without NEXTCLAW_PROCESS_SUPERVISOR; runtime updates will use supervisor-owned relaunch.\",\n );\n }\n return resolution.mode;\n}\n\ntype Config = NextclawCore.Config;\ntype MessageBus = NextclawCore.MessageBus;\n\ntype GatewayRuntimeOptions = {\n uiOverrides?: Partial<Config[\"ui\"]>;\n uiStaticDir?: string | null;\n};\n\nexport type GatewayRuntimeDeps = {\n requestRestart: (params: RequestRestartParams) => Promise<void>;\n initializeAgentHomeDirectory: (homeDirectory: string) => void;\n startService: (options: { uiOverrides: Record<string, unknown>; open: boolean }) => Promise<void>;\n stopService: () => Promise<void>;\n runCliSubcommand: (args: string[]) => Promise<string>;\n installBuiltinMarketplaceSkill: (slug: string, force: boolean | undefined) => { message: string; output?: string } | null;\n};\n\nexport class ServiceGatewayManager {\n readonly kernel: NextclawKernel;\n readonly desktopHost = new MacosDesktopHostService();\n readonly appEventBus: EventBus;\n readonly messageBus: MessageBus;\n readonly sessionManager: SessionManager;\n readonly automation: AutomationManager;\n readonly agentRunClient: AgentRunClient;\n readonly runtimeControl: UiRuntimeControlHost;\n readonly runtimeUpdate: NpmRuntimeUpdateHost | null;\n readonly ingress: Ingress;\n readonly distribution = NextclawDistributionService.get();\n readonly productVersion: string;\n readonly providerManager: LlmProviderManager;\n readonly gatewayController: GatewayControllerImpl;\n readonly productActivityReporter: ProductActivityReporter;\n\n readonly configManager: ConfigManager;\n readonly uiConfig: Config[\"ui\"];\n readonly uiStaticDir: string | null;\n readonly workspace: string;\n readonly remoteManager: GatewayRemoteManager;\n readonly marketplace: MarketplaceApiConfig;\n readonly extensions: GatewayExtensionManager;\n readonly restartWake: GatewayRestartWakeService;\n bootstrapStatus: ServiceBootstrapStatusStore;\n uiStartup: UiStartupHandle;\n readonly fileWatchers = new ServiceFileWatcherRegistry();\n private deferredChannelStarter: () => Promise<void>;\n\n constructor(\n private readonly deps: GatewayRuntimeDeps,\n private readonly options: GatewayRuntimeOptions,\n ) {\n const configPath = getConfigPath();\n const homeDir = getDataDir();\n this.productActivityReporter = new ProductActivityReporter({\n homeDir,\n productVersion: this.distribution.version,\n environment: this.distribution.productEnvironment,\n releaseChannel: this.distribution.releaseChannel,\n loadConfig: () => NextclawCore.loadConfig(configPath),\n });\n this.kernel = measureStartupSync(\n \"service.gateway.kernel\",\n () => new NextclawKernel({\n homeDir,\n configPath,\n builtInAppsDirectory: this.distribution.builtInAppsDirectory,\n portableServiceRunnerPath: this.distribution.portableServiceRunnerPath,\n productVersion: this.distribution.version,\n runtimeVersion: this.distribution.version,\n productActivitySink: this.productActivityReporter,\n desktopHost: this.desktopHost,\n }),\n );\n this.configManager = this.kernel.configManager;\n const config = this.configManager.config;\n this.uiConfig = resolveUiConfig(config, options.uiOverrides);\n this.uiStaticDir = options.uiStaticDir === undefined ? resolveUiStaticDir(this.distribution.uiDistDir) : options.uiStaticDir;\n this.workspace = getWorkspacePath(config.agents.defaults.workspace);\n this.appEventBus = this.kernel.eventBus;\n this.ingress = this.kernel.ingress;\n this.agentRunClient = new AgentRunClient({\n eventBus: this.kernel.eventBus,\n ingress: this.kernel.ingress,\n });\n this.messageBus = this.kernel.messageBus;\n this.sessionManager = this.kernel.sessionManager;\n this.automation = this.kernel.automation;\n this.productVersion = this.distribution.version;\n this.extensions = new GatewayExtensionManager(this);\n this.providerManager = this.kernel.llmProviders;\n this.installConfigHostHooks();\n this.restartWake = new GatewayRestartWakeService(this);\n this.bootstrapStatus = this.createBootstrapStatus();\n this.uiStartup = this.createDisabledUiStartup();\n this.remoteManager = new GatewayRemoteManager({\n deps: this.deps,\n configManager: this.configManager,\n uiConfig: this.uiConfig,\n onRemoteStateChange: (state) => this.bootstrapStatus.syncRemoteRuntimeState(state),\n });\n this.marketplace = this.createMarketplace();\n this.runtimeControl = createRuntimeControlHost({\n serviceCommands: this.deps,\n requestRestart: this.deps.requestRestart,\n uiConfig: this.uiConfig,\n });\n this.runtimeUpdate =\n process.env.NEXTCLAW_DISABLE_RUNTIME_UPDATE_HOST === \"1\"\n ? null\n : new NpmRuntimeUpdateHost({\n eventBus: this.appEventBus,\n applyRestartMode: resolveApplyRestartMode(this.uiConfig.port),\n requestRestart: this.deps.requestRestart,\n uiConfig: this.uiConfig,\n automaticCheckIntervalMs: resolveAutomaticUpdateCheckIntervalMs({\n verificationMode: process.env.NEXTCLAW_UPDATE_VERIFICATION_MODE === \"1\",\n verificationIntervalMs: process.env.NEXTCLAW_UPDATE_VERIFICATION_INTERVAL_MS,\n }),\n });\n this.gatewayController = this.createGatewayController();\n this.kernel.provideGatewayController(this.gatewayController);\n this.deferredChannelStarter = this.startChannels;\n this.automation.onJob = createCronJobHandler({\n agentRunClient: this.agentRunClient,\n });\n }\n\n start = async (): Promise<void> => {\n logStartupTrace(\"service.start_gateway.begin\");\n await this.reset();\n this.runtimeUpdate?.start();\n this.configureIngressHandlers();\n this.uiStartup = await this.startUiRuntime();\n await companionRuntimeService.applyConfig(this.configManager.config);\n await this.markUiRuntimeReady();\n await this.startSupportServices();\n await this.runRuntimeLoop();\n await companionRuntimeService.ensureStopped();\n logStartupTrace(\"service.start_gateway.end\");\n };\n\n private reset = async (): Promise<void> => {\n await this.fileWatchers.clear();\n this.bootstrapStatus = this.createBootstrapStatus();\n this.uiStartup = this.createDisabledUiStartup();\n this.deferredChannelStarter = this.startChannels;\n };\n\n private createBootstrapStatus = (): ServiceBootstrapStatusStore => {\n const bootstrapStatus = new ServiceBootstrapStatusStore();\n bootstrapStatus.markChannelsPending();\n bootstrapStatus.setRemoteState(this.configManager.config.remote.enabled ? \"pending\" : \"disabled\");\n return bootstrapStatus;\n };\n\n private createDisabledUiStartup = (): UiStartupHandle => ({\n endpoint: \"\",\n });\n\n private startUiRuntime = async (): Promise<UiStartupHandle> => {\n const uiStartup = await measureStartupAsync(\"service.start_ui_runtime\", async () => {\n logStartupTrace(\"service.start_ui_runtime.begin\");\n if (!this.uiConfig.enabled) {\n return this.createDisabledUiStartup();\n }\n const uiServer = await startUiServer(this.createUiRouterOptions());\n const uiUrl = NextclawCore.resolveLocalUiBaseUrl({\n host: uiServer.host,\n port: uiServer.port,\n });\n console.log(`✓ UI API: ${uiUrl}/api`);\n if (this.uiStaticDir) {\n console.log(`✓ UI frontend: ${uiUrl}`);\n }\n if (this.uiConfig.open) {\n openBrowser(uiUrl);\n }\n logStartupTrace(\"service.start_ui_runtime.ready\", {\n host: uiServer.host,\n port: uiServer.port,\n });\n return {\n endpoint: uiUrl,\n };\n });\n markLocalUiRuntimeIfStarted({\n uiStartup: this.uiConfig.enabled ? uiStartup : null,\n uiConfig: this.uiConfig,\n });\n return uiStartup;\n };\n\n private createUiRouterOptions = (): UiRouterOptions => ({\n kernel: this.kernel,\n configPath: this.configManager.configPath,\n appEventBus: this.appEventBus,\n uiConfig: this.uiConfig,\n uiStaticDir: this.uiStaticDir,\n panelAppClientSdkScript: readPanelAppClientSdkScript,\n productVersion: this.productVersion,\n applyLiveConfigReload: this.configManager.applyLiveConfigReload,\n initializeAgentHomeDirectory: this.deps.initializeAgentHomeDirectory,\n marketplace: this.marketplace,\n cron: this.automation,\n remoteAccess: this.remoteManager.remoteAccess,\n runtimeControl: this.runtimeControl,\n ...(this.runtimeUpdate ? { runtimeUpdate: this.runtimeUpdate } : {}),\n bootstrapStatus: this.bootstrapStatus,\n extensions: this.extensions,\n productActivity: this.productActivityReporter,\n });\n\n private runRuntimeLoop = async (): Promise<void> => {\n logStartupTrace(\"service.start_gateway.runtime_loop_begin\");\n let startupTask: Promise<void> | null = null;\n try {\n const runtimeLoopTask = runGatewayInboundLoop(this);\n startupTask = this.startDeferredRuntime();\n void startupTask.catch((error) => handleGatewayDeferredStartupError({\n bootstrapStatus: this.bootstrapStatus,\n error,\n }));\n await runtimeLoopTask;\n } finally {\n if (startupTask) {\n await startupTask.catch(() => undefined);\n }\n await this.stop();\n }\n };\n\n private startDeferredRuntime = async (): Promise<void> => {\n const app = new NextclawApp(this);\n await app.start();\n };\n\n readonly startDeferredChannels = async (): Promise<void> => {\n await this.deferredChannelStarter();\n };\n\n private readonly startChannels = async (): Promise<void> => {\n await this.kernel.channels.start();\n const enabledChannels = this.kernel.channels.enabledChannels;\n if (enabledChannels.length > 0) {\n console.log(`✓ Channels enabled: ${enabledChannels.join(\", \")}`);\n } else {\n console.log(\"Warning: No channels enabled\");\n }\n this.bootstrapStatus.markChannelsReady(enabledChannels);\n };\n\n private createMarketplace = (): MarketplaceApiConfig => ({\n apiBaseUrl: process.env.NEXTCLAW_MARKETPLACE_API_BASE,\n installer: new ServiceMarketplaceInstaller({\n applyLiveConfigReload: this.configManager.applyLiveConfigReload,\n runCliSubcommand: this.deps.runCliSubcommand,\n installBuiltinSkill: this.deps.installBuiltinMarketplaceSkill,\n }).createInstaller(),\n });\n\n readonly stop = async (): Promise<void> => {\n localUiRuntimeStore.clearIfOwnedByProcess();\n this.runtimeUpdate?.dispose();\n await this.fileWatchers.clear();\n await this.kernel.extensions.stop();\n await this.desktopHost.dispose();\n await this.remoteManager.stop();\n };\n\n private markUiRuntimeReady = async (): Promise<void> => {\n this.bootstrapStatus.markShellReady();\n await waitForNextTick();\n };\n\n private createGatewayController = (): GatewayControllerImpl => {\n return measureStartupSync(\n \"service.gateway.gateway_controller\",\n () => new GatewayControllerImpl({\n configManager: this.configManager,\n })\n );\n };\n\n private startSupportServices = async (): Promise<void> => {\n this.extensions.publishConfigChanges();\n await measureStartupAsync(\"service.start_gateway_support_services\", async () =>\n await new GatewayRuntimeSupportService({\n automation: this.automation,\n remoteModule: this.remoteManager.remoteModule,\n watchConfigFile: () => watchServiceConfigFile({\n configPath: resolve(getConfigPath()),\n watcherRegistry: this.fileWatchers,\n scheduleReload: (reason) => this.configManager.scheduleReload(reason)\n }),\n watcherRegistry: this.fileWatchers\n }).start()\n );\n };\n\n private installConfigHostHooks = (): void => {\n this.configManager.installRuntimeHooks({\n reloadCompanion: async ({ config: nextConfig }) => {\n await companionRuntimeService.applyConfig(nextConfig);\n },\n onRestartRequired: (paths) => {\n void this.deps.requestRestart({\n changedPaths: paths,\n manualMessage: `已保存以下改动,请在外部终端运行 nextclaw restart 后生效:${paths.join(\", \")}`,\n mode: \"notify\",\n reason: `config reload requires restart: ${paths.join(\", \")}`,\n strategy: \"background-service-or-manual\",\n });\n },\n });\n };\n\n private configureIngressHandlers = (): void => {\n this.kernel.extensions.registerIngressHandlers();\n };\n\n}\n"],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { RequestRestartParams } from "../types/cli.types.js";
|
|
2
2
|
import { ManagedServiceManager } from "./managed-service.manager.js";
|
|
3
|
+
import { PlannedRestartRecovery } from "@nextclaw/kernel";
|
|
3
4
|
|
|
4
5
|
//#region src/managers/service-restart.manager.d.ts
|
|
5
6
|
type ServiceRestartManagerDeps = {
|
|
@@ -10,7 +11,9 @@ declare class ServiceRestartManager {
|
|
|
10
11
|
private readonly restartCoordinator;
|
|
11
12
|
private serviceRestartTask;
|
|
12
13
|
private selfRelaunchArmed;
|
|
14
|
+
private plannedRestartRecovery;
|
|
13
15
|
constructor(deps: ServiceRestartManagerDeps);
|
|
16
|
+
installPlannedRestartRecovery: (recovery: PlannedRestartRecovery) => void;
|
|
14
17
|
requestRestart: (params: RequestRestartParams) => Promise<void>;
|
|
15
18
|
restartBackgroundService: (reason: string) => Promise<boolean>;
|
|
16
19
|
writeRestartSentinelFromExecContext: (reason: string) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-restart.manager.d.ts","names":[],"sources":["../../src/managers/service-restart.manager.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"service-restart.manager.d.ts","names":[],"sources":["../../src/managers/service-restart.manager.ts"],"mappings":";;;;;KAcK,yBAAA;EACH,cAAA,EAAgB,qBAAA;AAAA;AAAA,cAGL,qBAAA;EAAA,iBAYkB,IAAA;EAAA,iBAXZ,kBAAA;EAAA,QAOT,kBAAA;EAAA,QACA,iBAAA;EAAA,QACA,sBAAA;cAEqB,IAAA,EAAM,yBAAA;EAEnC,6BAAA,GAAiC,QAAA,EAAU,sBAAA;EAI3C,cAAA,GAAwB,MAAA,EAAQ,oBAAA,KAAuB,OAAA;EAiEvD,wBAAA,GAAkC,MAAA,aAAiB,OAAA;EAsCnD,mCAAA,GAA6C,MAAA,aAAiB,OAAA;EAAA,QA0BtD,mBAAA;EAAA,QAOA,yBAAA;AAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isProcessRunning } from "../utils/cli.utils.js";
|
|
2
|
+
import { localUiRuntimeStore } from "../stores/local-ui-runtime.store.js";
|
|
2
3
|
import { managedServiceStateStore } from "../stores/managed-service-state.store.js";
|
|
3
4
|
import { resolveCliSubcommandLaunch } from "../utils/marketplace/cli-subcommand-launch.utils.js";
|
|
4
5
|
import { NextclawDistributionService } from "../services/runtime/nextclaw-distribution.service.js";
|
|
@@ -18,9 +19,13 @@ var ServiceRestartManager = class {
|
|
|
18
19
|
});
|
|
19
20
|
serviceRestartTask = null;
|
|
20
21
|
selfRelaunchArmed = false;
|
|
22
|
+
plannedRestartRecovery = null;
|
|
21
23
|
constructor(deps) {
|
|
22
24
|
this.deps = deps;
|
|
23
25
|
}
|
|
26
|
+
installPlannedRestartRecovery = (recovery) => {
|
|
27
|
+
this.plannedRestartRecovery = recovery;
|
|
28
|
+
};
|
|
24
29
|
requestRestart = async (params) => {
|
|
25
30
|
const { changedPaths, delayMs, exitCode, manualMessage, mode, reason, silentNotification, silentOnServiceRestart, strategy } = params;
|
|
26
31
|
if (mode === "notify") {
|
|
@@ -32,11 +37,17 @@ var ServiceRestartManager = class {
|
|
|
32
37
|
if (!silentNotification) console.warn(manualMessage);
|
|
33
38
|
return;
|
|
34
39
|
}
|
|
35
|
-
this.
|
|
40
|
+
const recoveryTicket = strategy === "background-service-or-exit" && this.plannedRestartRecovery ? await this.plannedRestartRecovery.prepare(reason) : null;
|
|
41
|
+
const selfRelaunchArmed = this.armManagedServiceRelaunch({
|
|
36
42
|
reason,
|
|
37
43
|
strategy,
|
|
38
|
-
delayMs
|
|
44
|
+
delayMs,
|
|
45
|
+
operationId: recoveryTicket?.operationId
|
|
39
46
|
});
|
|
47
|
+
if (recoveryTicket && !selfRelaunchArmed) {
|
|
48
|
+
await this.plannedRestartRecovery?.abort(recoveryTicket.operationId);
|
|
49
|
+
throw new Error("Cannot perform a recoverable restart because the replacement process could not be armed.");
|
|
50
|
+
}
|
|
40
51
|
const result = await this.restartCoordinator.requestRestart({
|
|
41
52
|
reason,
|
|
42
53
|
strategy,
|
|
@@ -45,6 +56,7 @@ var ServiceRestartManager = class {
|
|
|
45
56
|
manualMessage
|
|
46
57
|
});
|
|
47
58
|
if (result.status === "manual-required" || result.status === "restart-in-progress") {
|
|
59
|
+
if (recoveryTicket) await this.plannedRestartRecovery?.abort(recoveryTicket.operationId);
|
|
48
60
|
console.log(result.message);
|
|
49
61
|
return;
|
|
50
62
|
}
|
|
@@ -105,11 +117,13 @@ var ServiceRestartManager = class {
|
|
|
105
117
|
}, delayMs);
|
|
106
118
|
};
|
|
107
119
|
armManagedServiceRelaunch = (params) => {
|
|
108
|
-
const { delayMs: requestedDelayMs, reason, strategy = "background-service-or-manual" } = params;
|
|
109
|
-
if (strategy !== "background-service-or-exit") return;
|
|
110
|
-
if (this.selfRelaunchArmed) return;
|
|
111
|
-
const
|
|
112
|
-
|
|
120
|
+
const { delayMs: requestedDelayMs, operationId, reason, strategy = "background-service-or-manual" } = params;
|
|
121
|
+
if (strategy !== "background-service-or-exit") return false;
|
|
122
|
+
if (this.selfRelaunchArmed) return true;
|
|
123
|
+
const managedState = managedServiceStateStore.read();
|
|
124
|
+
const foregroundState = localUiRuntimeStore.read();
|
|
125
|
+
const state = managedState?.pid === process.pid ? managedState : foregroundState?.pid === process.pid ? foregroundState : null;
|
|
126
|
+
if (!state) return false;
|
|
113
127
|
const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 55667;
|
|
114
128
|
const delayMs = typeof requestedDelayMs === "number" && Number.isFinite(requestedDelayMs) ? Math.max(0, Math.floor(requestedDelayMs)) : 100;
|
|
115
129
|
const launch = resolveCliSubcommandLaunch({
|
|
@@ -152,6 +166,10 @@ setTimeout(() => {
|
|
|
152
166
|
process.exit(0);
|
|
153
167
|
return;
|
|
154
168
|
}
|
|
169
|
+
if (isRunning(parentPid)) {
|
|
170
|
+
setTimeout(tick, retryIntervalMs);
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
155
173
|
tryStart();
|
|
156
174
|
if (hasReplacementService()) {
|
|
157
175
|
process.exit(0);
|
|
@@ -166,13 +184,19 @@ setTimeout(() => {
|
|
|
166
184
|
spawn(process.execPath, ["-e", helperScript], {
|
|
167
185
|
detached: true,
|
|
168
186
|
stdio: "ignore",
|
|
169
|
-
env: createExternalCommandEnv(
|
|
187
|
+
env: createExternalCommandEnv({
|
|
188
|
+
...process.env,
|
|
189
|
+
NEXTCLAW_RUNTIME_BUNDLE_CHILD: "0",
|
|
190
|
+
...operationId ? { NEXTCLAW_RESTART_OPERATION_ID: operationId } : {}
|
|
191
|
+
}),
|
|
170
192
|
windowsHide: true
|
|
171
193
|
}).unref();
|
|
172
194
|
this.selfRelaunchArmed = true;
|
|
173
195
|
console.warn(`Gateway self-restart armed (${reason}).`);
|
|
196
|
+
return true;
|
|
174
197
|
} catch (error) {
|
|
175
198
|
console.error(`Failed to arm gateway self-restart: ${String(error)}`);
|
|
199
|
+
return false;
|
|
176
200
|
}
|
|
177
201
|
};
|
|
178
202
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-restart.manager.js","names":[],"sources":["../../src/managers/service-restart.manager.ts"],"sourcesContent":["import { APP_NAME, createExternalCommandEnv } from \"@nextclaw/core\";\nimport { spawn } from \"node:child_process\";\nimport type { ManagedServiceManager } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { RestartCoordinator } from \"@nextclaw-service/services/restart/restart-coordinator.service.js\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport { pendingRestartStore } from \"@nextclaw-service/stores/pending-restart.store.js\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { isProcessRunning } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { resolveCliSubcommandLaunch } from \"@nextclaw-service/utils/marketplace/cli-subcommand-launch.utils.js\";\nimport { writeRestartSentinel } from \"@nextclaw-service/utils/restart-sentinel.utils.js\";\n\ntype ServiceRestartManagerDeps = {\n managedService: ManagedServiceManager;\n};\n\nexport class ServiceRestartManager {\n private readonly restartCoordinator = new RestartCoordinator({\n readServiceState: managedServiceStateStore.read,\n isProcessRunning,\n currentPid: () => process.pid,\n restartBackgroundService: async (reason) => this.restartBackgroundService(reason),\n scheduleProcessExit: (delayMs, reason, exitCode) => this.scheduleProcessExit(delayMs, reason, exitCode),\n });\n private serviceRestartTask: Promise<boolean> | null = null;\n private selfRelaunchArmed = false;\n\n constructor(private readonly deps: ServiceRestartManagerDeps) {}\n\n requestRestart = async (params: RequestRestartParams): Promise<void> => {\n const {\n changedPaths,\n delayMs,\n exitCode,\n manualMessage,\n mode,\n reason,\n silentNotification,\n silentOnServiceRestart,\n strategy\n } = params;\n if (mode === \"notify\") {\n pendingRestartStore.mark({\n changedPaths,\n manualMessage,\n reason\n });\n if (!silentNotification) {\n console.warn(manualMessage);\n }\n return;\n }\n\n this.armManagedServiceRelaunch({\n reason,\n strategy,\n delayMs\n });\n\n const result = await this.restartCoordinator.requestRestart({\n reason,\n strategy,\n exitCode,\n delayMs,\n manualMessage\n });\n if (result.status === \"manual-required\" || result.status === \"restart-in-progress\") {\n console.log(result.message);\n return;\n }\n\n pendingRestartStore.clear();\n if (result.status === \"service-restarted\") {\n if (!silentOnServiceRestart) {\n console.log(result.message);\n }\n return;\n }\n\n console.warn(result.message);\n };\n\n restartBackgroundService = async (reason: string): Promise<boolean> => {\n if (this.serviceRestartTask) {\n return this.serviceRestartTask;\n }\n\n this.serviceRestartTask = (async () => {\n const state = managedServiceStateStore.read();\n if (!state || !isProcessRunning(state.pid) || state.pid === process.pid) {\n return false;\n }\n\n const uiPort =\n typeof state.uiPort === \"number\" && Number.isFinite(state.uiPort)\n ? state.uiPort\n : 55667;\n\n console.log(\n `Applying changes (${reason}): restarting ${APP_NAME} background service...`,\n );\n await this.deps.managedService.stopService();\n await this.deps.managedService.startService({\n uiOverrides: {\n enabled: true,\n host: \"0.0.0.0\",\n port: uiPort,\n },\n open: false,\n });\n return true;\n })();\n\n try {\n return await this.serviceRestartTask;\n } finally {\n this.serviceRestartTask = null;\n }\n };\n\n writeRestartSentinelFromExecContext = async (reason: string): Promise<void> => {\n const sessionKeyRaw = process.env.NEXTCLAW_RUNTIME_SESSION_KEY;\n const sessionKey =\n typeof sessionKeyRaw === \"string\" ? sessionKeyRaw.trim() : \"\";\n if (!sessionKey) {\n return;\n }\n\n try {\n await writeRestartSentinel({\n kind: \"restart\",\n status: \"ok\",\n ts: Date.now(),\n sessionKey,\n stats: {\n reason: reason || \"cli.restart\",\n strategy: \"exec-tool\",\n },\n });\n } catch (error) {\n console.warn(\n `Warning: failed to write restart sentinel from exec context: ${String(error)}`,\n );\n }\n };\n\n private scheduleProcessExit = (delayMs: number, reason: string, exitCode: number): void => {\n console.warn(`Gateway restart requested (${reason}).`);\n setTimeout(() => {\n process.exit(exitCode);\n }, delayMs);\n };\n\n private armManagedServiceRelaunch = (params: {\n reason: string;\n strategy?: RequestRestartParams[\"strategy\"];\n delayMs?: number;\n }): void => {\n const { delayMs: requestedDelayMs, reason, strategy = \"background-service-or-manual\" } = params;\n if (strategy !== \"background-service-or-exit\") {\n return;\n }\n if (this.selfRelaunchArmed) {\n return;\n }\n\n const state = managedServiceStateStore.read();\n if (!state || state.pid !== process.pid) {\n return;\n }\n\n const uiPort =\n typeof state.uiPort === \"number\" && Number.isFinite(state.uiPort)\n ? state.uiPort\n : 55667;\n const delayMs =\n typeof requestedDelayMs === \"number\" && Number.isFinite(requestedDelayMs)\n ? Math.max(0, Math.floor(requestedDelayMs))\n : 100;\n const launch = resolveCliSubcommandLaunch({\n argvEntry: NextclawDistributionService.get().launcherEntrypoint,\n importMetaUrl: import.meta.url,\n cliArgs: [\"start\", \"--ui-port\", String(uiPort)]\n });\n const serviceStatePath = managedServiceStateStore.path;\n const helperScript = `\nconst { spawnSync } = require(\"node:child_process\");\nconst { readFileSync } = require(\"node:fs\");\nconst parentPid = ${process.pid};\nconst delayMs = ${delayMs};\nconst maxWaitMs = 120000;\nconst retryIntervalMs = 1000;\nconst command = ${JSON.stringify(launch.command)};\nconst args = ${JSON.stringify(launch.args)};\nconst serviceStatePath = ${JSON.stringify(serviceStatePath)};\nfunction isRunning(pid) {\n try { process.kill(pid, 0); return true; } catch { return false; }\n}\nfunction hasReplacementService() {\n try {\n const state = JSON.parse(readFileSync(serviceStatePath, \"utf-8\"));\n const pid = Number(state?.pid);\n return Number.isFinite(pid) && pid > 0 && pid !== parentPid && isRunning(pid);\n } catch { return false; }\n}\nfunction tryStart() {\n spawnSync(command, args, { stdio: \"ignore\", env: process.env, timeout: 60000, windowsHide: true });\n}\nsetTimeout(() => {\n const startedAt = Date.now();\n const tick = () => {\n if (hasReplacementService() || Date.now() - startedAt >= maxWaitMs) {\n process.exit(0);\n return;\n }\n tryStart();\n if (hasReplacementService()) {\n process.exit(0);\n return;\n }\n setTimeout(tick, retryIntervalMs);\n };\n tick();\n}, delayMs);\n`.trim();\n\n try {\n const helper = spawn(process.execPath, [\"-e\", helperScript], {\n detached: true,\n stdio: \"ignore\",\n env: createExternalCommandEnv(process.env),\n windowsHide: true\n });\n helper.unref();\n this.selfRelaunchArmed = true;\n console.warn(`Gateway self-restart armed (${reason}).`);\n } catch (error) {\n console.error(`Failed to arm gateway self-restart: ${String(error)}`);\n }\n };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service-restart.manager.js","names":[],"sources":["../../src/managers/service-restart.manager.ts"],"sourcesContent":["import { APP_NAME, createExternalCommandEnv } from \"@nextclaw/core\";\nimport type { PlannedRestartRecovery } from \"@nextclaw/kernel\";\nimport { spawn } from \"node:child_process\";\nimport type { ManagedServiceManager } from \"@nextclaw-service/managers/managed-service.manager.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport { RestartCoordinator } from \"@nextclaw-service/services/restart/restart-coordinator.service.js\";\nimport { managedServiceStateStore } from \"@nextclaw-service/stores/managed-service-state.store.js\";\nimport { localUiRuntimeStore } from \"@nextclaw-service/stores/local-ui-runtime.store.js\";\nimport { pendingRestartStore } from \"@nextclaw-service/stores/pending-restart.store.js\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { isProcessRunning } from \"@nextclaw-service/utils/cli.utils.js\";\nimport { resolveCliSubcommandLaunch } from \"@nextclaw-service/utils/marketplace/cli-subcommand-launch.utils.js\";\nimport { writeRestartSentinel } from \"@nextclaw-service/utils/restart-sentinel.utils.js\";\n\ntype ServiceRestartManagerDeps = {\n managedService: ManagedServiceManager;\n};\n\nexport class ServiceRestartManager {\n private readonly restartCoordinator = new RestartCoordinator({\n readServiceState: managedServiceStateStore.read,\n isProcessRunning,\n currentPid: () => process.pid,\n restartBackgroundService: async (reason) => this.restartBackgroundService(reason),\n scheduleProcessExit: (delayMs, reason, exitCode) => this.scheduleProcessExit(delayMs, reason, exitCode),\n });\n private serviceRestartTask: Promise<boolean> | null = null;\n private selfRelaunchArmed = false;\n private plannedRestartRecovery: PlannedRestartRecovery | null = null;\n\n constructor(private readonly deps: ServiceRestartManagerDeps) {}\n\n installPlannedRestartRecovery = (recovery: PlannedRestartRecovery): void => {\n this.plannedRestartRecovery = recovery;\n };\n\n requestRestart = async (params: RequestRestartParams): Promise<void> => {\n const {\n changedPaths,\n delayMs,\n exitCode,\n manualMessage,\n mode,\n reason,\n silentNotification,\n silentOnServiceRestart,\n strategy\n } = params;\n if (mode === \"notify\") {\n pendingRestartStore.mark({\n changedPaths,\n manualMessage,\n reason\n });\n if (!silentNotification) {\n console.warn(manualMessage);\n }\n return;\n }\n\n const recoveryTicket =\n strategy === \"background-service-or-exit\" && this.plannedRestartRecovery\n ? await this.plannedRestartRecovery.prepare(reason)\n : null;\n const selfRelaunchArmed = this.armManagedServiceRelaunch({\n reason,\n strategy,\n delayMs,\n operationId: recoveryTicket?.operationId,\n });\n if (recoveryTicket && !selfRelaunchArmed) {\n await this.plannedRestartRecovery?.abort(recoveryTicket.operationId);\n throw new Error(\"Cannot perform a recoverable restart because the replacement process could not be armed.\");\n }\n\n const result = await this.restartCoordinator.requestRestart({\n reason,\n strategy,\n exitCode,\n delayMs,\n manualMessage\n });\n if (result.status === \"manual-required\" || result.status === \"restart-in-progress\") {\n if (recoveryTicket) {\n await this.plannedRestartRecovery?.abort(recoveryTicket.operationId);\n }\n console.log(result.message);\n return;\n }\n\n pendingRestartStore.clear();\n if (result.status === \"service-restarted\") {\n if (!silentOnServiceRestart) {\n console.log(result.message);\n }\n return;\n }\n\n console.warn(result.message);\n };\n\n restartBackgroundService = async (reason: string): Promise<boolean> => {\n if (this.serviceRestartTask) {\n return this.serviceRestartTask;\n }\n\n this.serviceRestartTask = (async () => {\n const state = managedServiceStateStore.read();\n if (!state || !isProcessRunning(state.pid) || state.pid === process.pid) {\n return false;\n }\n\n const uiPort =\n typeof state.uiPort === \"number\" && Number.isFinite(state.uiPort)\n ? state.uiPort\n : 55667;\n\n console.log(\n `Applying changes (${reason}): restarting ${APP_NAME} background service...`,\n );\n await this.deps.managedService.stopService();\n await this.deps.managedService.startService({\n uiOverrides: {\n enabled: true,\n host: \"0.0.0.0\",\n port: uiPort,\n },\n open: false,\n });\n return true;\n })();\n\n try {\n return await this.serviceRestartTask;\n } finally {\n this.serviceRestartTask = null;\n }\n };\n\n writeRestartSentinelFromExecContext = async (reason: string): Promise<void> => {\n const sessionKeyRaw = process.env.NEXTCLAW_RUNTIME_SESSION_KEY;\n const sessionKey =\n typeof sessionKeyRaw === \"string\" ? sessionKeyRaw.trim() : \"\";\n if (!sessionKey) {\n return;\n }\n\n try {\n await writeRestartSentinel({\n kind: \"restart\",\n status: \"ok\",\n ts: Date.now(),\n sessionKey,\n stats: {\n reason: reason || \"cli.restart\",\n strategy: \"exec-tool\",\n },\n });\n } catch (error) {\n console.warn(\n `Warning: failed to write restart sentinel from exec context: ${String(error)}`,\n );\n }\n };\n\n private scheduleProcessExit = (delayMs: number, reason: string, exitCode: number): void => {\n console.warn(`Gateway restart requested (${reason}).`);\n setTimeout(() => {\n process.exit(exitCode);\n }, delayMs);\n };\n\n private armManagedServiceRelaunch = (params: {\n reason: string;\n strategy?: RequestRestartParams[\"strategy\"];\n delayMs?: number;\n operationId?: string;\n }): boolean => {\n const {\n delayMs: requestedDelayMs,\n operationId,\n reason,\n strategy = \"background-service-or-manual\",\n } = params;\n if (strategy !== \"background-service-or-exit\") {\n return false;\n }\n if (this.selfRelaunchArmed) {\n return true;\n }\n\n const managedState = managedServiceStateStore.read();\n const foregroundState = localUiRuntimeStore.read();\n const state = managedState?.pid === process.pid\n ? managedState\n : foregroundState?.pid === process.pid\n ? foregroundState\n : null;\n if (!state) return false;\n\n const uiPort =\n typeof state.uiPort === \"number\" && Number.isFinite(state.uiPort)\n ? state.uiPort\n : 55667;\n const delayMs =\n typeof requestedDelayMs === \"number\" && Number.isFinite(requestedDelayMs)\n ? Math.max(0, Math.floor(requestedDelayMs))\n : 100;\n const launch = resolveCliSubcommandLaunch({\n argvEntry: NextclawDistributionService.get().launcherEntrypoint,\n importMetaUrl: import.meta.url,\n cliArgs: [\"start\", \"--ui-port\", String(uiPort)]\n });\n const serviceStatePath = managedServiceStateStore.path;\n const helperScript = `\nconst { spawnSync } = require(\"node:child_process\");\nconst { readFileSync } = require(\"node:fs\");\nconst parentPid = ${process.pid};\nconst delayMs = ${delayMs};\nconst maxWaitMs = 120000;\nconst retryIntervalMs = 1000;\nconst command = ${JSON.stringify(launch.command)};\nconst args = ${JSON.stringify(launch.args)};\nconst serviceStatePath = ${JSON.stringify(serviceStatePath)};\nfunction isRunning(pid) {\n try { process.kill(pid, 0); return true; } catch { return false; }\n}\nfunction hasReplacementService() {\n try {\n const state = JSON.parse(readFileSync(serviceStatePath, \"utf-8\"));\n const pid = Number(state?.pid);\n return Number.isFinite(pid) && pid > 0 && pid !== parentPid && isRunning(pid);\n } catch { return false; }\n}\nfunction tryStart() {\n spawnSync(command, args, { stdio: \"ignore\", env: process.env, timeout: 60000, windowsHide: true });\n}\nsetTimeout(() => {\n const startedAt = Date.now();\n const tick = () => {\n if (hasReplacementService() || Date.now() - startedAt >= maxWaitMs) {\n process.exit(0);\n return;\n }\n if (isRunning(parentPid)) {\n setTimeout(tick, retryIntervalMs);\n return;\n }\n tryStart();\n if (hasReplacementService()) {\n process.exit(0);\n return;\n }\n setTimeout(tick, retryIntervalMs);\n };\n tick();\n}, delayMs);\n`.trim();\n\n try {\n const helper = spawn(process.execPath, [\"-e\", helperScript], {\n detached: true,\n stdio: \"ignore\",\n env: createExternalCommandEnv({\n ...process.env,\n NEXTCLAW_RUNTIME_BUNDLE_CHILD: \"0\",\n ...(operationId\n ? { NEXTCLAW_RESTART_OPERATION_ID: operationId }\n : {}),\n }),\n windowsHide: true\n });\n helper.unref();\n this.selfRelaunchArmed = true;\n console.warn(`Gateway self-restart armed (${reason}).`);\n return true;\n } catch (error) {\n console.error(`Failed to arm gateway self-restart: ${String(error)}`);\n return false;\n }\n };\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextclaw-app.service.d.ts","names":[],"sources":["../../../src/services/gateway/nextclaw-app.service.ts"],"mappings":";;;KAIY,eAAA;EACV,QAAA;AAAA;AAAA,cAQW,WAAA;EAAA,
|
|
1
|
+
{"version":3,"file":"nextclaw-app.service.d.ts","names":[],"sources":["../../../src/services/gateway/nextclaw-app.service.ts"],"mappings":";;;KAIY,eAAA;EACV,QAAA;AAAA;AAAA,cAQW,WAAA;EAAA,iBAIkB,OAAA;EAAA,iBAHZ,MAAA;EAAA,QACT,WAAA;cAEqB,OAAA,EAAS,qBAAA;EAItC,KAAA,QAAkB,OAAA;EAalB,eAAA,QAA4B,OAAA;EAe5B,4BAAA,QAAyC,OAAA;EAAA,iBA8BxB,wBAAA;AAAA"}
|
|
@@ -2,6 +2,7 @@ import { logStartupTrace, measureStartupAsync } from "../../utils/startup-trace.
|
|
|
2
2
|
//#region src/services/gateway/nextclaw-app.service.ts
|
|
3
3
|
var NextclawApp = class {
|
|
4
4
|
kernel;
|
|
5
|
+
kernelReady = false;
|
|
5
6
|
constructor(gateway) {
|
|
6
7
|
this.gateway = gateway;
|
|
7
8
|
this.kernel = gateway.kernel;
|
|
@@ -21,6 +22,7 @@ var NextclawApp = class {
|
|
|
21
22
|
this.gateway.bootstrapStatus.markNcpAgentRunning();
|
|
22
23
|
await measureStartupAsync("service.deferred_startup.bootstrap_kernel", async () => await this.kernel.start());
|
|
23
24
|
this.gateway.bootstrapStatus.markNcpAgentReady();
|
|
25
|
+
this.kernelReady = true;
|
|
24
26
|
if (this.gateway.uiConfig.enabled) {
|
|
25
27
|
console.log("✓ UI NCP agent: ready");
|
|
26
28
|
return;
|
|
@@ -31,6 +33,11 @@ var NextclawApp = class {
|
|
|
31
33
|
await measureStartupAsync("service.deferred_startup.load_extensions", this.gateway.extensions.load);
|
|
32
34
|
await measureStartupAsync("service.deferred_startup.start_extensions", async () => await this.kernel.extensions.start({ endpoint: this.gateway.uiStartup.endpoint }));
|
|
33
35
|
await measureStartupAsync("service.deferred_startup.start_channels", this.gateway.startDeferredChannels);
|
|
36
|
+
await measureStartupAsync("service.deferred_startup.recover_planned_restart", async () => {
|
|
37
|
+
if (!this.kernelReady) return;
|
|
38
|
+
const result = await this.kernel.plannedRestartRecovery.recover(process.env.NEXTCLAW_RESTART_OPERATION_ID);
|
|
39
|
+
if (result.status === "recovered") console.log(`✓ Planned restart recovery: ${result.resumed} resumed, ${result.skipped} skipped, ${result.failed} failed`);
|
|
40
|
+
});
|
|
34
41
|
await measureStartupAsync("service.deferred_startup.wake_restart_sentinel", this.gateway.restartWake.wakeFromRestartSentinel);
|
|
35
42
|
};
|
|
36
43
|
handleKernelStartupError = (error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextclaw-app.service.js","names":[],"sources":["../../../src/services/gateway/nextclaw-app.service.ts"],"sourcesContent":["import type { NextclawKernel } from \"@nextclaw/kernel\";\nimport { logStartupTrace, measureStartupAsync } from \"@nextclaw-service/utils/startup-trace.utils.js\";\nimport type { ServiceGatewayManager } from \"@nextclaw-service/managers/service-gateway.manager.js\";\n\nexport type UiStartupHandle = {\n endpoint: string;\n};\n\ntype NextclawAppKernel = Pick<\n NextclawKernel,\n \"extensions\" | \"start\"\n>;\n\nexport class NextclawApp {\n private readonly kernel: NextclawAppKernel;\n\n constructor(private readonly gateway: ServiceGatewayManager) {\n this.kernel = gateway.kernel;\n }\n\n start = async (): Promise<void> => {\n logStartupTrace(\"service.deferred_startup.begin\");\n try {\n await this.bootstrapKernel();\n } catch (error) {\n this.handleKernelStartupError(error);\n }\n\n await this.startDeferredRuntimeServices();\n console.log(\"✓ Deferred startup: extensions and channels settled\");\n logStartupTrace(\"service.deferred_startup.end\");\n };\n\n bootstrapKernel = async (): Promise<void> => {\n this.gateway.bootstrapStatus.markNcpAgentRunning();\n await measureStartupAsync(\n \"service.deferred_startup.bootstrap_kernel\",\n async () => await this.kernel.start(),\n );\n this.gateway.bootstrapStatus.markNcpAgentReady();\n if (this.gateway.uiConfig.enabled) {\n console.log(\"✓ UI NCP agent: ready\");\n return;\n }\n console.log(\"✓ Service NCP agent: ready\");\n };\n\n startDeferredRuntimeServices = async (): Promise<void> => {\n await measureStartupAsync(\n \"service.deferred_startup.load_extensions\",\n this.gateway.extensions.load,\n );\n await measureStartupAsync(\n \"service.deferred_startup.start_extensions\",\n async () => await this.kernel.extensions.start({ endpoint: this.gateway.uiStartup.endpoint }),\n );\n await measureStartupAsync(\"service.deferred_startup.start_channels\", this.gateway.startDeferredChannels);\n await measureStartupAsync(\n \"service.deferred_startup.wake_restart_sentinel\",\n this.gateway.restartWake.wakeFromRestartSentinel,\n );\n };\n\n private readonly handleKernelStartupError = (error: unknown): void => {\n this.gateway.bootstrapStatus.markNcpAgentError(\n error instanceof Error ? error.message : String(error),\n );\n console.error(\n `UI NCP agent startup failed: ${error instanceof Error ? error.message : String(error)}`,\n );\n };\n}\n"],"mappings":";;AAaA,IAAa,cAAb,MAAyB;CACvB;
|
|
1
|
+
{"version":3,"file":"nextclaw-app.service.js","names":[],"sources":["../../../src/services/gateway/nextclaw-app.service.ts"],"sourcesContent":["import type { NextclawKernel } from \"@nextclaw/kernel\";\nimport { logStartupTrace, measureStartupAsync } from \"@nextclaw-service/utils/startup-trace.utils.js\";\nimport type { ServiceGatewayManager } from \"@nextclaw-service/managers/service-gateway.manager.js\";\n\nexport type UiStartupHandle = {\n endpoint: string;\n};\n\ntype NextclawAppKernel = Pick<\n NextclawKernel,\n \"extensions\" | \"plannedRestartRecovery\" | \"start\"\n>;\n\nexport class NextclawApp {\n private readonly kernel: NextclawAppKernel;\n private kernelReady = false;\n\n constructor(private readonly gateway: ServiceGatewayManager) {\n this.kernel = gateway.kernel;\n }\n\n start = async (): Promise<void> => {\n logStartupTrace(\"service.deferred_startup.begin\");\n try {\n await this.bootstrapKernel();\n } catch (error) {\n this.handleKernelStartupError(error);\n }\n\n await this.startDeferredRuntimeServices();\n console.log(\"✓ Deferred startup: extensions and channels settled\");\n logStartupTrace(\"service.deferred_startup.end\");\n };\n\n bootstrapKernel = async (): Promise<void> => {\n this.gateway.bootstrapStatus.markNcpAgentRunning();\n await measureStartupAsync(\n \"service.deferred_startup.bootstrap_kernel\",\n async () => await this.kernel.start(),\n );\n this.gateway.bootstrapStatus.markNcpAgentReady();\n this.kernelReady = true;\n if (this.gateway.uiConfig.enabled) {\n console.log(\"✓ UI NCP agent: ready\");\n return;\n }\n console.log(\"✓ Service NCP agent: ready\");\n };\n\n startDeferredRuntimeServices = async (): Promise<void> => {\n await measureStartupAsync(\n \"service.deferred_startup.load_extensions\",\n this.gateway.extensions.load,\n );\n await measureStartupAsync(\n \"service.deferred_startup.start_extensions\",\n async () => await this.kernel.extensions.start({ endpoint: this.gateway.uiStartup.endpoint }),\n );\n await measureStartupAsync(\"service.deferred_startup.start_channels\", this.gateway.startDeferredChannels);\n await measureStartupAsync(\n \"service.deferred_startup.recover_planned_restart\",\n async () => {\n if (!this.kernelReady) return;\n const result = await this.kernel.plannedRestartRecovery.recover(\n process.env.NEXTCLAW_RESTART_OPERATION_ID,\n );\n if (result.status === \"recovered\") {\n console.log(\n `✓ Planned restart recovery: ${result.resumed} resumed, ${result.skipped} skipped, ${result.failed} failed`,\n );\n }\n },\n );\n await measureStartupAsync(\n \"service.deferred_startup.wake_restart_sentinel\",\n this.gateway.restartWake.wakeFromRestartSentinel,\n );\n };\n\n private readonly handleKernelStartupError = (error: unknown): void => {\n this.gateway.bootstrapStatus.markNcpAgentError(\n error instanceof Error ? error.message : String(error),\n );\n console.error(\n `UI NCP agent startup failed: ${error instanceof Error ? error.message : String(error)}`,\n );\n };\n}\n"],"mappings":";;AAaA,IAAa,cAAb,MAAyB;CACvB;CACA,cAAsB;CAEtB,YAAY,SAAiD;AAAhC,OAAA,UAAA;AAC3B,OAAK,SAAS,QAAQ;;CAGxB,QAAQ,YAA2B;AACjC,kBAAgB,iCAAiC;AACjD,MAAI;AACF,SAAM,KAAK,iBAAiB;WACrB,OAAO;AACd,QAAK,yBAAyB,MAAM;;AAGtC,QAAM,KAAK,8BAA8B;AACzC,UAAQ,IAAI,sDAAsD;AAClE,kBAAgB,+BAA+B;;CAGjD,kBAAkB,YAA2B;AAC3C,OAAK,QAAQ,gBAAgB,qBAAqB;AAClD,QAAM,oBACJ,6CACA,YAAY,MAAM,KAAK,OAAO,OAAO,CACtC;AACD,OAAK,QAAQ,gBAAgB,mBAAmB;AAChD,OAAK,cAAc;AACnB,MAAI,KAAK,QAAQ,SAAS,SAAS;AACjC,WAAQ,IAAI,wBAAwB;AACpC;;AAEF,UAAQ,IAAI,6BAA6B;;CAG3C,+BAA+B,YAA2B;AACxD,QAAM,oBACJ,4CACA,KAAK,QAAQ,WAAW,KACzB;AACD,QAAM,oBACJ,6CACA,YAAY,MAAM,KAAK,OAAO,WAAW,MAAM,EAAE,UAAU,KAAK,QAAQ,UAAU,UAAU,CAAC,CAC9F;AACD,QAAM,oBAAoB,2CAA2C,KAAK,QAAQ,sBAAsB;AACxG,QAAM,oBACJ,oDACA,YAAY;AACV,OAAI,CAAC,KAAK,YAAa;GACvB,MAAM,SAAS,MAAM,KAAK,OAAO,uBAAuB,QACtD,QAAQ,IAAI,8BACb;AACD,OAAI,OAAO,WAAW,YACpB,SAAQ,IACN,+BAA+B,OAAO,QAAQ,YAAY,OAAO,QAAQ,YAAY,OAAO,OAAO,SACpG;IAGN;AACD,QAAM,oBACJ,kDACA,KAAK,QAAQ,YAAY,wBAC1B;;CAGH,4BAA6C,UAAyB;AACpE,OAAK,QAAQ,gBAAgB,kBAC3B,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,CACvD;AACD,UAAQ,MACN,gCAAgC,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,GACvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-runtime-update-command.service.d.ts","names":[],"sources":["../../../src/services/runtime/npm-runtime-update-command.service.ts"],"mappings":";;;;cAUa,8BAAA;EAAA,iBACkB,GAAA;cAAA,GAAA,GAAK,MAAA,CAAO,UAAA;EAEzC,GAAA,GAAa,IAAA,EAAM,oBAAA,KAAuB,OAAA,CAAQ,cAAA;EAUlD,UAAA,GAAoB,IAAA,EAAM,oBAAA,KAAuB,OAAA,CAAQ,cAAA;EAAA,
|
|
1
|
+
{"version":3,"file":"npm-runtime-update-command.service.d.ts","names":[],"sources":["../../../src/services/runtime/npm-runtime-update-command.service.ts"],"mappings":";;;;cAUa,8BAAA;EAAA,iBACkB,GAAA;cAAA,GAAA,GAAK,MAAA,CAAO,UAAA;EAEzC,GAAA,GAAa,IAAA,EAAM,oBAAA,KAAuB,OAAA,CAAQ,cAAA;EAUlD,UAAA,GAAoB,IAAA,EAAM,oBAAA,KAAuB,OAAA,CAAQ,cAAA;EAAA,QA+CjD,aAAA;EAAA,QASA,aAAA;EAAA,QAiCA,0CAAA;AAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-runtime-update-command.service.js","names":[],"sources":["../../../src/services/runtime/npm-runtime-update-command.service.ts"],"sourcesContent":["import { NpmRuntimeBundleLayoutStore } from \"@nextclaw-service/stores/npm-runtime-bundle-layout.store.js\";\nimport { NpmRuntimeBundleService } from \"@nextclaw-service/services/runtime/npm-runtime-bundle.service.js\";\nimport { RuntimeUpdateManager } from \"@nextclaw-service/managers/runtime-update.manager.js\";\nimport { NpmRuntimeUpdateService } from \"@nextclaw-service/services/runtime/npm-runtime-update.service.js\";\nimport { NpmRuntimeUpdateSourceService } from \"@nextclaw-service/services/runtime/npm-runtime-update-source.service.js\";\nimport { NpmRuntimeUpdateStateStore } from \"@nextclaw-service/stores/npm-runtime-update-state.store.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport type { UpdateCommandOptions } from \"@nextclaw-service/types/cli.types.js\";\nimport type { UpdateProgress, UpdateSnapshot } from \"@nextclaw/kernel\";\n\nexport class NpmRuntimeUpdateCommandService {\n constructor(private readonly env: NodeJS.ProcessEnv = process.env) {}\n\n run = async (opts: UpdateCommandOptions): Promise<UpdateSnapshot> => {\n const snapshot = await this.runManaged(opts);\n if (opts.json) {\n console.log(JSON.stringify(snapshot, null, 2));\n } else {\n this.printSnapshot(snapshot);\n }\n return snapshot;\n };\n\n runManaged = async (opts: UpdateCommandOptions): Promise<UpdateSnapshot> => {\n if (this.env.NEXTCLAW_DESKTOP_COMMAND_SURFACE === \"1\") {\n return this.createDesktopCommandSurfaceBlockedSnapshot(opts);\n }\n\n const downloadOnly = Boolean(opts.downloadOnly || opts.download);\n const distribution = NextclawDistributionService.get();\n const source = new NpmRuntimeUpdateSourceService({\n packagedPublicKeyPath: distribution.runtimeUpdatePublicKeyPath,\n });\n const launcherVersion = distribution.launcherVersion;\n const channel = source.resolveChannel(opts.channel, launcherVersion);\n const manifestUrls = source.resolveManifestUrls(channel, opts.manifestUrl);\n const layout = new NpmRuntimeBundleLayoutStore();\n const stateStore = new NpmRuntimeUpdateStateStore(layout.getStatePath(), {\n defaultChannel: channel\n });\n const bundleService = new NpmRuntimeBundleService({\n layout,\n stateStore,\n launcherVersion\n });\n const updateService = new NpmRuntimeUpdateService({\n layout,\n bundleService,\n launcherVersion,\n bundlePublicKey: source.resolveBundlePublicKey() ?? undefined\n });\n const manager = new RuntimeUpdateManager({\n layout,\n stateStore,\n bundleService,\n updateService,\n resolveManifestUrls: () => manifestUrls,\n launcherVersion,\n channel\n });\n\n return await manager.run({\n apply: Boolean(opts.apply),\n checkOnly: Boolean(opts.check),\n applyAfterDownload: !downloadOnly,\n onProgress: opts.json ? undefined : this.printProgress\n });\n };\n\n private printProgress = (progress: UpdateProgress): void => {\n const percent = progress.percent === null ? \"\" : ` ${progress.percent}%`;\n const total = progress.totalBytes === null ? \"\" : ` / ${progress.totalBytes} bytes`;\n process.stdout.write(`\\rDownloading${percent} (${progress.downloadedBytes} bytes${total})`);\n if (progress.percent === 100) {\n process.stdout.write(\"\\n\");\n }\n };\n\n private printSnapshot = (snapshot: UpdateSnapshot): void => {\n if (snapshot.status === \"blocked\") {\n console.error(`Update blocked: ${snapshot.errorMessage ?? snapshot.blockReason ?? \"unknown reason\"}`);\n if (snapshot.recoveryCommand) {\n console.error(`Recovery: ${snapshot.recoveryCommand}`);\n }\n return;\n }\n if (snapshot.status === \"failed\") {\n console.error(`Update failed: ${snapshot.errorMessage ?? \"unknown error\"}`);\n return;\n }\n if (snapshot.status === \"up-to-date\") {\n console.log(`NextClaw runtime is already up to date (${snapshot.currentVersion ?? snapshot.hostVersion ?? \"unknown\"}).`);\n return;\n }\n if (snapshot.status === \"downloaded\") {\n console.log(`Runtime update downloaded: ${snapshot.downloadedVersion ?? snapshot.availableVersion}`);\n console.log(\"Run `nextclaw update --apply` to switch to the downloaded runtime.\");\n return;\n }\n if (snapshot.status === \"restart-required\") {\n console.log(`Runtime update applied: ${snapshot.targetVersion ?? \"unknown\"}`);\n console.log(\"Restart the running NextClaw service or start a new CLI process to use it.\");\n return;\n }\n if (snapshot.status === \"update-available\") {\n console.log(`Runtime update available: ${snapshot.currentVersion ?? \"none\"} -> ${snapshot.availableVersion}`);\n return;\n }\n console.log(`Update status: ${snapshot.status}`);\n };\n\n private createDesktopCommandSurfaceBlockedSnapshot = (opts: UpdateCommandOptions): UpdateSnapshot => {\n const distribution = NextclawDistributionService.get();\n return {\n status: \"blocked\",\n installationKind: \"desktop-bundle\",\n channel: opts.channel === \"beta\" ? \"beta\" : \"stable\",\n hostVersion: distribution.version,\n currentVersion: distribution.version,\n availableVersion: null,\n downloadedVersion: null,\n minimumHostVersion: null,\n releaseNotesUrl: null,\n lastCheckedAt: new Date().toISOString(),\n progress: null,\n canApplyInApp: false,\n requiresRestart: false,\n blockReason: \"unsupported-installation\",\n recoveryCommand: \"Use the desktop update settings or restart NextClaw Desktop to check for desktop updates.\",\n errorMessage: \"The desktop-installed nextclaw command uses the desktop update channel instead of the npm runtime updater.\"\n };\n };\n}\n"],"mappings":";;;;;;;;AAUA,IAAa,iCAAb,MAA4C;CAC1C,YAAY,MAA0C,QAAQ,KAAK;AAAtC,OAAA,MAAA;;CAE7B,MAAM,OAAO,SAAwD;EACnE,MAAM,WAAW,MAAM,KAAK,WAAW,KAAK;AAC5C,MAAI,KAAK,KACP,SAAQ,IAAI,KAAK,UAAU,UAAU,MAAM,EAAE,CAAC;MAE9C,MAAK,cAAc,SAAS;AAE9B,SAAO;;CAGT,aAAa,OAAO,SAAwD;AAC1E,MAAI,KAAK,IAAI,qCAAqC,IAChD,QAAO,KAAK,2CAA2C,KAAK;EAG9D,MAAM,eAAe,QAAQ,KAAK,gBAAgB,KAAK,SAAS;EAChE,MAAM,eAAe,4BAA4B,KAAK;EACtD,MAAM,SAAS,IAAI,8BAA8B,EAC/C,uBAAuB,aAAa,4BACrC,CAAC;EACF,MAAM,kBAAkB,aAAa;EACrC,MAAM,UAAU,OAAO,eAAe,KAAK,SAAS,gBAAgB;EACpE,MAAM,eAAe,OAAO,oBAAoB,SAAS,KAAK,YAAY;EAC1E,MAAM,SAAS,IAAI,6BAA6B;EAChD,MAAM,aAAa,IAAI,2BAA2B,OAAO,cAAc,EAAE,EACvE,gBAAgB,SACjB,CAAC;EACF,MAAM,gBAAgB,IAAI,wBAAwB;GAChD;GACA;GACA;GACD,CAAC;
|
|
1
|
+
{"version":3,"file":"npm-runtime-update-command.service.js","names":[],"sources":["../../../src/services/runtime/npm-runtime-update-command.service.ts"],"sourcesContent":["import { NpmRuntimeBundleLayoutStore } from \"@nextclaw-service/stores/npm-runtime-bundle-layout.store.js\";\nimport { NpmRuntimeBundleService } from \"@nextclaw-service/services/runtime/npm-runtime-bundle.service.js\";\nimport { RuntimeUpdateManager } from \"@nextclaw-service/managers/runtime-update.manager.js\";\nimport { NpmRuntimeUpdateService } from \"@nextclaw-service/services/runtime/npm-runtime-update.service.js\";\nimport { NpmRuntimeUpdateSourceService } from \"@nextclaw-service/services/runtime/npm-runtime-update-source.service.js\";\nimport { NpmRuntimeUpdateStateStore } from \"@nextclaw-service/stores/npm-runtime-update-state.store.js\";\nimport { NextclawDistributionService } from \"@nextclaw-service/services/runtime/nextclaw-distribution.service.js\";\nimport type { UpdateCommandOptions } from \"@nextclaw-service/types/cli.types.js\";\nimport type { UpdateProgress, UpdateSnapshot } from \"@nextclaw/kernel\";\n\nexport class NpmRuntimeUpdateCommandService {\n constructor(private readonly env: NodeJS.ProcessEnv = process.env) {}\n\n run = async (opts: UpdateCommandOptions): Promise<UpdateSnapshot> => {\n const snapshot = await this.runManaged(opts);\n if (opts.json) {\n console.log(JSON.stringify(snapshot, null, 2));\n } else {\n this.printSnapshot(snapshot);\n }\n return snapshot;\n };\n\n runManaged = async (opts: UpdateCommandOptions): Promise<UpdateSnapshot> => {\n if (this.env.NEXTCLAW_DESKTOP_COMMAND_SURFACE === \"1\") {\n return this.createDesktopCommandSurfaceBlockedSnapshot(opts);\n }\n\n const downloadOnly = Boolean(opts.downloadOnly || opts.download);\n const distribution = NextclawDistributionService.get();\n const source = new NpmRuntimeUpdateSourceService({\n packagedPublicKeyPath: distribution.runtimeUpdatePublicKeyPath,\n });\n const launcherVersion = distribution.launcherVersion;\n const channel = source.resolveChannel(opts.channel, launcherVersion);\n const manifestUrls = source.resolveManifestUrls(channel, opts.manifestUrl);\n const layout = new NpmRuntimeBundleLayoutStore();\n const stateStore = new NpmRuntimeUpdateStateStore(layout.getStatePath(), {\n defaultChannel: channel\n });\n const bundleService = new NpmRuntimeBundleService({\n layout,\n stateStore,\n launcherVersion\n });\n const updateService = new NpmRuntimeUpdateService({\n layout,\n bundleService,\n launcherVersion,\n bundlePublicKey: source.resolveBundlePublicKey() ?? undefined\n });\n const manager = new RuntimeUpdateManager({\n layout,\n stateStore,\n bundleService,\n updateService,\n resolveManifestUrls: () => manifestUrls,\n runningVersion: distribution.version,\n launcherVersion,\n channel\n });\n\n return await manager.run({\n apply: Boolean(opts.apply),\n checkOnly: Boolean(opts.check),\n applyAfterDownload: !downloadOnly,\n onProgress: opts.json ? undefined : this.printProgress\n });\n };\n\n private printProgress = (progress: UpdateProgress): void => {\n const percent = progress.percent === null ? \"\" : ` ${progress.percent}%`;\n const total = progress.totalBytes === null ? \"\" : ` / ${progress.totalBytes} bytes`;\n process.stdout.write(`\\rDownloading${percent} (${progress.downloadedBytes} bytes${total})`);\n if (progress.percent === 100) {\n process.stdout.write(\"\\n\");\n }\n };\n\n private printSnapshot = (snapshot: UpdateSnapshot): void => {\n if (snapshot.status === \"blocked\") {\n console.error(`Update blocked: ${snapshot.errorMessage ?? snapshot.blockReason ?? \"unknown reason\"}`);\n if (snapshot.recoveryCommand) {\n console.error(`Recovery: ${snapshot.recoveryCommand}`);\n }\n return;\n }\n if (snapshot.status === \"failed\") {\n console.error(`Update failed: ${snapshot.errorMessage ?? \"unknown error\"}`);\n return;\n }\n if (snapshot.status === \"up-to-date\") {\n console.log(`NextClaw runtime is already up to date (${snapshot.currentVersion ?? snapshot.hostVersion ?? \"unknown\"}).`);\n return;\n }\n if (snapshot.status === \"downloaded\") {\n console.log(`Runtime update downloaded: ${snapshot.downloadedVersion ?? snapshot.availableVersion}`);\n console.log(\"Run `nextclaw update --apply` to switch to the downloaded runtime.\");\n return;\n }\n if (snapshot.status === \"restart-required\") {\n console.log(`Runtime update applied: ${snapshot.targetVersion ?? \"unknown\"}`);\n console.log(\"Restart the running NextClaw service or start a new CLI process to use it.\");\n return;\n }\n if (snapshot.status === \"update-available\") {\n console.log(`Runtime update available: ${snapshot.currentVersion ?? \"none\"} -> ${snapshot.availableVersion}`);\n return;\n }\n console.log(`Update status: ${snapshot.status}`);\n };\n\n private createDesktopCommandSurfaceBlockedSnapshot = (opts: UpdateCommandOptions): UpdateSnapshot => {\n const distribution = NextclawDistributionService.get();\n return {\n status: \"blocked\",\n installationKind: \"desktop-bundle\",\n channel: opts.channel === \"beta\" ? \"beta\" : \"stable\",\n hostVersion: distribution.version,\n currentVersion: distribution.version,\n availableVersion: null,\n downloadedVersion: null,\n minimumHostVersion: null,\n releaseNotesUrl: null,\n lastCheckedAt: new Date().toISOString(),\n progress: null,\n canApplyInApp: false,\n requiresRestart: false,\n blockReason: \"unsupported-installation\",\n recoveryCommand: \"Use the desktop update settings or restart NextClaw Desktop to check for desktop updates.\",\n errorMessage: \"The desktop-installed nextclaw command uses the desktop update channel instead of the npm runtime updater.\"\n };\n };\n}\n"],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { NextclawDistributionService } from "./nextclaw-distribution.service.js";
|
|
2
|
+
import { requestManagedServiceRestart } from "../ui/service-remote-access.service.js";
|
|
2
3
|
import { NpmRuntimeBundleLayoutStore } from "../../stores/npm-runtime-bundle-layout.store.js";
|
|
3
4
|
import { NpmRuntimeBundleService } from "./npm-runtime-bundle.service.js";
|
|
4
5
|
import { RuntimeUpdateManager } from "../../managers/runtime-update.manager.js";
|
|
5
6
|
import { NpmRuntimeUpdateService } from "./npm-runtime-update.service.js";
|
|
6
7
|
import { NpmRuntimeUpdateSourceService } from "./npm-runtime-update-source.service.js";
|
|
7
8
|
import { NpmRuntimeUpdateStateStore } from "../../stores/npm-runtime-update-state.store.js";
|
|
8
|
-
import { requestManagedServiceRestart } from "../ui/service-remote-access.service.js";
|
|
9
9
|
import { getAppLogger } from "@nextclaw/core";
|
|
10
10
|
import { AUTOMATIC_UPDATE_CHECK_INTERVAL_MS } from "@nextclaw/kernel";
|
|
11
11
|
import { eventKeys } from "@nextclaw/shared";
|
|
@@ -3,8 +3,8 @@ import { UpdateManifestReader, serializeUnsignedUpdateManifest } from "@nextclaw
|
|
|
3
3
|
import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
|
|
4
4
|
import { dirname, join, resolve, sep } from "node:path";
|
|
5
5
|
import { fileURLToPath } from "node:url";
|
|
6
|
-
import { rm } from "node:fs/promises";
|
|
7
6
|
import { createHash, createPublicKey, verify } from "node:crypto";
|
|
7
|
+
import { rm } from "node:fs/promises";
|
|
8
8
|
import JSZip from "jszip";
|
|
9
9
|
//#region src/services/runtime/npm-runtime-update.service.ts
|
|
10
10
|
var NpmRuntimeUpdateService = class {
|
|
@@ -57,12 +57,12 @@ var RuntimeControlHost = class {
|
|
|
57
57
|
};
|
|
58
58
|
};
|
|
59
59
|
restartService = async () => {
|
|
60
|
-
|
|
60
|
+
await requestManagedServiceRestart(this.deps.requestRestart, { uiPort: this.deps.uiConfig.port });
|
|
61
61
|
return {
|
|
62
|
-
accepted:
|
|
62
|
+
accepted: true,
|
|
63
63
|
action: "restart-service",
|
|
64
64
|
lifecycle: "restarting-service",
|
|
65
|
-
message:
|
|
65
|
+
message: "Restart scheduled for the current host."
|
|
66
66
|
};
|
|
67
67
|
};
|
|
68
68
|
stopService = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-control-host.service.js","names":[],"sources":["../../../src/services/ui/runtime-control-host.service.ts"],"sourcesContent":["import type { Config } from \"@nextclaw/core\";\nimport type { RuntimeControlActionResult, RuntimeControlView, UiRuntimeControlHost } from \"@nextclaw/server\";\nimport { requestManagedServiceRestart } from \"@nextclaw-service/services/ui/service-remote-access.service.js\";\nimport { controlRemoteService, resolveRemoteServiceView } from \"@nextclaw-service/services/remote/remote-service-control.service.js\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { pendingRestartStore } from \"@nextclaw-service/stores/pending-restart.store.js\";\n\nconst MANAGED_SERVICE_OWNER_LABEL = \"Managed local service\";\nconst DESKTOP_APP_ONLY_REASON = \"App restart is only available in the desktop shell.\";\nconst RUNNING_PAGE_START_REASON = \"This page is already hosted by the running local service.\";\n\ntype RuntimeControlHostDeps = {\n serviceCommands: {\n startService: (options: { uiOverrides: Record<string, unknown>; open: boolean }) => Promise<void>;\n stopService: () => Promise<void>;\n };\n requestRestart: (params: RequestRestartParams) => Promise<void>;\n uiConfig: Pick<Config[\"ui\"], \"host\" | \"port\">;\n};\n\nexport class RuntimeControlHost implements UiRuntimeControlHost {\n constructor(private readonly deps: RuntimeControlHostDeps) {}\n\n getControl = (): RuntimeControlView => {\n const service = resolveRemoteServiceView(this.deps.uiConfig);\n const serviceRunning = service.running;\n const pendingRestart = pendingRestartStore.read();\n\n return {\n environment: \"managed-local-service\",\n lifecycle: serviceRunning ? \"healthy\" : \"unavailable\",\n serviceState: serviceRunning ? \"running\" : \"stopped\",\n canStartService: {\n available: !serviceRunning,\n requiresConfirmation: false,\n impact: \"brief-ui-disconnect\",\n ...(serviceRunning ? { reasonIfUnavailable: RUNNING_PAGE_START_REASON } : {})\n },\n canRestartService: {\n available: serviceRunning,\n requiresConfirmation: false,\n impact: \"brief-ui-disconnect\",\n ...(!serviceRunning ? { reasonIfUnavailable: \"The local service is not running.\" } : {})\n },\n canStopService: {\n available: serviceRunning,\n requiresConfirmation: true,\n impact: \"brief-ui-disconnect\",\n ...(!serviceRunning ? { reasonIfUnavailable: \"The local service is already stopped.\" } : {})\n },\n canRestartApp: {\n available: false,\n requiresConfirmation: true,\n impact: \"full-app-relaunch\",\n reasonIfUnavailable: DESKTOP_APP_ONLY_REASON\n },\n pendingRestart,\n ownerLabel: MANAGED_SERVICE_OWNER_LABEL,\n managementHint: service.currentProcess\n ? \"This page is served by the running local service. Closing the browser does not stop it.\"\n : \"Manage the local NextClaw service from this page without tying service lifecycle to the browser tab.\",\n message: \"Use this page to manage the local NextClaw service. Closing the browser does not stop the service.\"\n };\n };\n\n startService = async (): Promise<RuntimeControlActionResult> => {\n const result = await controlRemoteService(\"start\", this.createServiceControlDeps());\n return {\n accepted: result.accepted,\n action: \"start-service\",\n lifecycle: \"starting-service\",\n message: result.message\n };\n };\n\n restartService = async (): Promise<RuntimeControlActionResult> => {\n
|
|
1
|
+
{"version":3,"file":"runtime-control-host.service.js","names":[],"sources":["../../../src/services/ui/runtime-control-host.service.ts"],"sourcesContent":["import type { Config } from \"@nextclaw/core\";\nimport type { RuntimeControlActionResult, RuntimeControlView, UiRuntimeControlHost } from \"@nextclaw/server\";\nimport { requestManagedServiceRestart } from \"@nextclaw-service/services/ui/service-remote-access.service.js\";\nimport { controlRemoteService, resolveRemoteServiceView } from \"@nextclaw-service/services/remote/remote-service-control.service.js\";\nimport type { RequestRestartParams } from \"@nextclaw-service/types/cli.types.js\";\nimport { pendingRestartStore } from \"@nextclaw-service/stores/pending-restart.store.js\";\n\nconst MANAGED_SERVICE_OWNER_LABEL = \"Managed local service\";\nconst DESKTOP_APP_ONLY_REASON = \"App restart is only available in the desktop shell.\";\nconst RUNNING_PAGE_START_REASON = \"This page is already hosted by the running local service.\";\n\ntype RuntimeControlHostDeps = {\n serviceCommands: {\n startService: (options: { uiOverrides: Record<string, unknown>; open: boolean }) => Promise<void>;\n stopService: () => Promise<void>;\n };\n requestRestart: (params: RequestRestartParams) => Promise<void>;\n uiConfig: Pick<Config[\"ui\"], \"host\" | \"port\">;\n};\n\nexport class RuntimeControlHost implements UiRuntimeControlHost {\n constructor(private readonly deps: RuntimeControlHostDeps) {}\n\n getControl = (): RuntimeControlView => {\n const service = resolveRemoteServiceView(this.deps.uiConfig);\n const serviceRunning = service.running;\n const pendingRestart = pendingRestartStore.read();\n\n return {\n environment: \"managed-local-service\",\n lifecycle: serviceRunning ? \"healthy\" : \"unavailable\",\n serviceState: serviceRunning ? \"running\" : \"stopped\",\n canStartService: {\n available: !serviceRunning,\n requiresConfirmation: false,\n impact: \"brief-ui-disconnect\",\n ...(serviceRunning ? { reasonIfUnavailable: RUNNING_PAGE_START_REASON } : {})\n },\n canRestartService: {\n available: serviceRunning,\n requiresConfirmation: false,\n impact: \"brief-ui-disconnect\",\n ...(!serviceRunning ? { reasonIfUnavailable: \"The local service is not running.\" } : {})\n },\n canStopService: {\n available: serviceRunning,\n requiresConfirmation: true,\n impact: \"brief-ui-disconnect\",\n ...(!serviceRunning ? { reasonIfUnavailable: \"The local service is already stopped.\" } : {})\n },\n canRestartApp: {\n available: false,\n requiresConfirmation: true,\n impact: \"full-app-relaunch\",\n reasonIfUnavailable: DESKTOP_APP_ONLY_REASON\n },\n pendingRestart,\n ownerLabel: MANAGED_SERVICE_OWNER_LABEL,\n managementHint: service.currentProcess\n ? \"This page is served by the running local service. Closing the browser does not stop it.\"\n : \"Manage the local NextClaw service from this page without tying service lifecycle to the browser tab.\",\n message: \"Use this page to manage the local NextClaw service. Closing the browser does not stop the service.\"\n };\n };\n\n startService = async (): Promise<RuntimeControlActionResult> => {\n const result = await controlRemoteService(\"start\", this.createServiceControlDeps());\n return {\n accepted: result.accepted,\n action: \"start-service\",\n lifecycle: \"starting-service\",\n message: result.message\n };\n };\n\n restartService = async (): Promise<RuntimeControlActionResult> => {\n await requestManagedServiceRestart(this.deps.requestRestart, { uiPort: this.deps.uiConfig.port });\n return {\n accepted: true,\n action: \"restart-service\",\n lifecycle: \"restarting-service\",\n message: \"Restart scheduled for the current host.\"\n };\n };\n\n stopService = async (): Promise<RuntimeControlActionResult> => {\n const result = await controlRemoteService(\"stop\", this.createServiceControlDeps());\n return {\n accepted: result.accepted,\n action: \"stop-service\",\n lifecycle: \"stopping-service\",\n message: result.message\n };\n };\n\n private createServiceControlDeps = () => {\n return {\n serviceCommands: this.deps.serviceCommands,\n requestManagedServiceRestart: () =>\n requestManagedServiceRestart(this.deps.requestRestart, { uiPort: this.deps.uiConfig.port }),\n currentUi: this.deps.uiConfig\n };\n };\n}\n\nexport function createRuntimeControlHost(params: RuntimeControlHostDeps): RuntimeControlHost {\n return new RuntimeControlHost(params);\n}\n"],"mappings":";;;;AAOA,MAAM,8BAA8B;AACpC,MAAM,0BAA0B;AAChC,MAAM,4BAA4B;AAWlC,IAAa,qBAAb,MAAgE;CAC9D,YAAY,MAA+C;AAA9B,OAAA,OAAA;;CAE7B,mBAAuC;EACrC,MAAM,UAAU,yBAAyB,KAAK,KAAK,SAAS;EAC5D,MAAM,iBAAiB,QAAQ;EAC/B,MAAM,iBAAiB,oBAAoB,MAAM;AAEjD,SAAO;GACL,aAAa;GACb,WAAW,iBAAiB,YAAY;GACxC,cAAc,iBAAiB,YAAY;GAC3C,iBAAiB;IACf,WAAW,CAAC;IACZ,sBAAsB;IACtB,QAAQ;IACR,GAAI,iBAAiB,EAAE,qBAAqB,2BAA2B,GAAG,EAAE;IAC7E;GACD,mBAAmB;IACjB,WAAW;IACX,sBAAsB;IACtB,QAAQ;IACR,GAAI,CAAC,iBAAiB,EAAE,qBAAqB,qCAAqC,GAAG,EAAE;IACxF;GACD,gBAAgB;IACd,WAAW;IACX,sBAAsB;IACtB,QAAQ;IACR,GAAI,CAAC,iBAAiB,EAAE,qBAAqB,yCAAyC,GAAG,EAAE;IAC5F;GACD,eAAe;IACb,WAAW;IACX,sBAAsB;IACtB,QAAQ;IACR,qBAAqB;IACtB;GACD;GACA,YAAY;GACZ,gBAAgB,QAAQ,iBACpB,4FACA;GACJ,SAAS;GACV;;CAGH,eAAe,YAAiD;EAC9D,MAAM,SAAS,MAAM,qBAAqB,SAAS,KAAK,0BAA0B,CAAC;AACnF,SAAO;GACL,UAAU,OAAO;GACjB,QAAQ;GACR,WAAW;GACX,SAAS,OAAO;GACjB;;CAGH,iBAAiB,YAAiD;AAChE,QAAM,6BAA6B,KAAK,KAAK,gBAAgB,EAAE,QAAQ,KAAK,KAAK,SAAS,MAAM,CAAC;AACjG,SAAO;GACL,UAAU;GACV,QAAQ;GACR,WAAW;GACX,SAAS;GACV;;CAGH,cAAc,YAAiD;EAC7D,MAAM,SAAS,MAAM,qBAAqB,QAAQ,KAAK,0BAA0B,CAAC;AAClF,SAAO;GACL,UAAU,OAAO;GACjB,QAAQ;GACR,WAAW;GACX,SAAS,OAAO;GACjB;;CAGH,iCAAyC;AACvC,SAAO;GACL,iBAAiB,KAAK,KAAK;GAC3B,oCACE,6BAA6B,KAAK,KAAK,gBAAgB,EAAE,QAAQ,KAAK,KAAK,SAAS,MAAM,CAAC;GAC7F,WAAW,KAAK,KAAK;GACtB;;;AAIL,SAAgB,yBAAyB,QAAoD;AAC3F,QAAO,IAAI,mBAAmB,OAAO"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nextclaw/service",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "NextClaw long-running service host and runtime lifecycle.",
|
|
6
6
|
"type": "module",
|
|
@@ -42,31 +42,31 @@
|
|
|
42
42
|
"chokidar": "^3.6.0",
|
|
43
43
|
"commander": "^12.1.0",
|
|
44
44
|
"jszip": "^3.10.1",
|
|
45
|
-
"@nextclaw/channel-extension-dingtalk": "0.2.
|
|
46
|
-
"@nextclaw/channel-extension-discord": "0.2.
|
|
47
|
-
"@nextclaw/channel-extension-
|
|
48
|
-
"@nextclaw/channel-extension-
|
|
49
|
-
"@nextclaw/channel-extension-
|
|
50
|
-
"@nextclaw/channel-extension-slack": "0.2.
|
|
51
|
-
"@nextclaw/channel-extension-telegram": "0.2.
|
|
52
|
-
"@nextclaw/channel-extension-wecom": "0.2.
|
|
53
|
-
"@nextclaw/
|
|
54
|
-
"@nextclaw/channel-extension-
|
|
55
|
-
"@nextclaw/
|
|
56
|
-
"@nextclaw/
|
|
57
|
-
"@nextclaw/
|
|
45
|
+
"@nextclaw/channel-extension-dingtalk": "0.2.49",
|
|
46
|
+
"@nextclaw/channel-extension-discord": "0.2.49",
|
|
47
|
+
"@nextclaw/channel-extension-qq": "0.2.36",
|
|
48
|
+
"@nextclaw/channel-extension-email": "0.2.49",
|
|
49
|
+
"@nextclaw/channel-extension-feishu": "0.2.38",
|
|
50
|
+
"@nextclaw/channel-extension-slack": "0.2.49",
|
|
51
|
+
"@nextclaw/channel-extension-telegram": "0.2.49",
|
|
52
|
+
"@nextclaw/channel-extension-wecom": "0.2.49",
|
|
53
|
+
"@nextclaw/channel-extension-weixin": "0.2.38",
|
|
54
|
+
"@nextclaw/channel-extension-whatsapp": "0.2.49",
|
|
55
|
+
"@nextclaw/client-sdk": "0.12.6",
|
|
56
|
+
"@nextclaw/core": "0.18.0",
|
|
57
|
+
"@nextclaw/kernel": "0.18.0",
|
|
58
|
+
"@nextclaw/mcp": "0.3.50",
|
|
58
59
|
"@nextclaw/ncp": "0.11.0",
|
|
59
|
-
"@nextclaw/mcp": "0.3.49",
|
|
60
60
|
"@nextclaw/ncp-agent-runtime": "0.4.24",
|
|
61
|
-
"@nextclaw/ncp-mcp": "0.2.
|
|
61
|
+
"@nextclaw/ncp-mcp": "0.2.50",
|
|
62
|
+
"@nextclaw/ncp-toolkit": "0.6.25",
|
|
62
63
|
"@nextclaw/nextclaw-hermes-acp-bridge": "0.3.22",
|
|
63
64
|
"@nextclaw/nextclaw-ncp-runtime-http-client": "0.3.23",
|
|
64
|
-
"@nextclaw/ncp-
|
|
65
|
-
"@nextclaw/
|
|
66
|
-
"@nextclaw/remote": "0.3.
|
|
67
|
-
"@nextclaw/server": "0.23.
|
|
68
|
-
"@nextclaw/shared": "0.
|
|
69
|
-
"@nextclaw/runtime": "0.4.48"
|
|
65
|
+
"@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.3.50",
|
|
66
|
+
"@nextclaw/runtime": "0.4.49",
|
|
67
|
+
"@nextclaw/remote": "0.3.63",
|
|
68
|
+
"@nextclaw/server": "0.23.6",
|
|
69
|
+
"@nextclaw/shared": "0.8.0"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
72
|
"@types/node": "^20.17.6",
|