@nextclaw/service 0.6.8 → 0.7.1
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/index.d.ts +2 -2
- 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 +35 -9
- package/dist/managers/service-restart.manager.js.map +1 -1
- package/dist/services/diagnostics/diagnostics-commands.service.d.ts +1 -0
- package/dist/services/diagnostics/diagnostics-commands.service.d.ts.map +1 -1
- package/dist/services/diagnostics/diagnostics-commands.service.js +17 -0
- package/dist/services/diagnostics/diagnostics-commands.service.js.map +1 -1
- package/dist/services/diagnostics/runtime-version-probe.service.d.ts +14 -0
- package/dist/services/diagnostics/runtime-version-probe.service.d.ts.map +1 -0
- package/dist/services/diagnostics/runtime-version-probe.service.js +39 -0
- package/dist/services/diagnostics/runtime-version-probe.service.js.map +1 -0
- package/dist/services/gateway/gateway-restart-wake.service.d.ts.map +1 -1
- package/dist/services/gateway/gateway-restart-wake.service.js +2 -5
- package/dist/services/gateway/gateway-restart-wake.service.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 +9 -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.d.ts.map +1 -1
- package/dist/services/runtime/npm-runtime-update-host.service.js +6 -9
- package/dist/services/runtime/npm-runtime-update-host.service.js.map +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/dist/types/cli.types.d.ts +9 -1
- package/dist/types/cli.types.d.ts.map +1 -1
- package/dist/utils/diagnostics/diagnostics-render.utils.d.ts.map +1 -1
- package/dist/utils/diagnostics/diagnostics-render.utils.js +1 -0
- package/dist/utils/diagnostics/diagnostics-render.utils.js.map +1 -1
- package/dist/utils/runtime/process-supervisor.utils.d.ts +7 -0
- package/dist/utils/runtime/process-supervisor.utils.d.ts.map +1 -0
- package/dist/utils/runtime/process-supervisor.utils.js +12 -0
- package/dist/utils/runtime/process-supervisor.utils.js.map +1 -0
- package/package.json +26 -26
|
@@ -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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AccountCommandOptions, AccountSetUsernameCommandOptions, AgentCommandOptions, AgentsListCommandOptions, AgentsNewCommandOptions, AgentsRemoveCommandOptions, AgentsRuntimeConfigCommandOptions, AgentsRuntimesCommandOptions, AgentsUpdateCommandOptions, ChannelsAddOptions, ChannelsListOptions, ChannelsLoginOptions, ConfigGetOptions, ConfigSetOptions, CronAddOptions, DoctorCommandOptions, GatewayCommandOptions, HealthProbe, LoginCommandOptions, LogsQueryCommandOptions, LogsTailCommandOptions, MarketplaceSkillsRecommendCommandOptions, MarketplaceSkillsSearchCommandOptions, MarketplaceSkillsUpdateCommandOptions, McpAddCommandOptions, McpDoctorOptions, McpListOptions, PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions, RemoteConnectCommandOptions, RemoteDoctorCommandOptions, RemoteEnableCommandOptions, RemoteStatusCommandOptions, RequestRestartParams, RuntimeStatusReport, SecretsApplyOptions, SecretsAuditOptions, SecretsConfigureOptions, SecretsReloadOptions, ServiceAutostartCommandOptions, SkillsInfoCommandOptions, SkillsInstalledCommandOptions, StartCommandOptions, StatusCommandOptions, UiCommandOptions, UpdateCommandOptions, UsageCommandOptions } from "./types/cli.types.js";
|
|
1
|
+
import { AccountCommandOptions, AccountSetUsernameCommandOptions, AgentCommandOptions, AgentsListCommandOptions, AgentsNewCommandOptions, AgentsRemoveCommandOptions, AgentsRuntimeConfigCommandOptions, AgentsRuntimesCommandOptions, AgentsUpdateCommandOptions, ChannelsAddOptions, ChannelsListOptions, ChannelsLoginOptions, ConfigGetOptions, ConfigSetOptions, CronAddOptions, DoctorCommandOptions, GatewayCommandOptions, HealthProbe, LoginCommandOptions, LogsQueryCommandOptions, LogsTailCommandOptions, MarketplaceSkillsRecommendCommandOptions, MarketplaceSkillsSearchCommandOptions, MarketplaceSkillsUpdateCommandOptions, McpAddCommandOptions, McpDoctorOptions, McpListOptions, PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions, RemoteConnectCommandOptions, RemoteDoctorCommandOptions, RemoteEnableCommandOptions, RemoteStatusCommandOptions, RequestRestartParams, RuntimeStatusReport, RuntimeVersionProbe, SecretsApplyOptions, SecretsAuditOptions, SecretsConfigureOptions, SecretsReloadOptions, ServiceAutostartCommandOptions, SkillsInfoCommandOptions, SkillsInstalledCommandOptions, StartCommandOptions, StatusCommandOptions, UiCommandOptions, UpdateCommandOptions, UsageCommandOptions } from "./types/cli.types.js";
|
|
2
2
|
import { NextclawServiceRuntime, NextclawServiceRuntimeOptions, runNextclawNpmRuntimeLauncher } from "./app/nextclaw-service-runtime.js";
|
|
3
3
|
import { NextclawDistribution } from "./types/distribution.types.js";
|
|
4
4
|
import { NextclawDistributionService } from "./services/runtime/nextclaw-distribution.service.js";
|
|
5
5
|
import { readLearningLoopRuntimeConfig } from "@nextclaw/kernel";
|
|
6
|
-
export { AccountCommandOptions, AccountSetUsernameCommandOptions, AgentCommandOptions, AgentsListCommandOptions, AgentsNewCommandOptions, AgentsRemoveCommandOptions, AgentsRuntimeConfigCommandOptions, AgentsRuntimesCommandOptions, AgentsUpdateCommandOptions, ChannelsAddOptions, ChannelsListOptions, ChannelsLoginOptions, ConfigGetOptions, ConfigSetOptions, CronAddOptions, DoctorCommandOptions, GatewayCommandOptions, HealthProbe, LoginCommandOptions, LogsQueryCommandOptions, LogsTailCommandOptions, MarketplaceSkillsRecommendCommandOptions, MarketplaceSkillsSearchCommandOptions, MarketplaceSkillsUpdateCommandOptions, McpAddCommandOptions, McpDoctorOptions, McpListOptions, type NextclawDistribution, NextclawDistributionService, NextclawServiceRuntime, type NextclawServiceRuntimeOptions, PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions, RemoteConnectCommandOptions, RemoteDoctorCommandOptions, RemoteEnableCommandOptions, RemoteStatusCommandOptions, RequestRestartParams, RuntimeStatusReport, SecretsApplyOptions, SecretsAuditOptions, SecretsConfigureOptions, SecretsReloadOptions, ServiceAutostartCommandOptions, SkillsInfoCommandOptions, SkillsInstalledCommandOptions, StartCommandOptions, StatusCommandOptions, UiCommandOptions, UpdateCommandOptions, UsageCommandOptions, readLearningLoopRuntimeConfig, runNextclawNpmRuntimeLauncher };
|
|
6
|
+
export { AccountCommandOptions, AccountSetUsernameCommandOptions, AgentCommandOptions, AgentsListCommandOptions, AgentsNewCommandOptions, AgentsRemoveCommandOptions, AgentsRuntimeConfigCommandOptions, AgentsRuntimesCommandOptions, AgentsUpdateCommandOptions, ChannelsAddOptions, ChannelsListOptions, ChannelsLoginOptions, ConfigGetOptions, ConfigSetOptions, CronAddOptions, DoctorCommandOptions, GatewayCommandOptions, HealthProbe, LoginCommandOptions, LogsQueryCommandOptions, LogsTailCommandOptions, MarketplaceSkillsRecommendCommandOptions, MarketplaceSkillsSearchCommandOptions, MarketplaceSkillsUpdateCommandOptions, McpAddCommandOptions, McpDoctorOptions, McpListOptions, type NextclawDistribution, NextclawDistributionService, NextclawServiceRuntime, type NextclawServiceRuntimeOptions, PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions, RemoteConnectCommandOptions, RemoteDoctorCommandOptions, RemoteEnableCommandOptions, RemoteStatusCommandOptions, RequestRestartParams, RuntimeStatusReport, RuntimeVersionProbe, SecretsApplyOptions, SecretsAuditOptions, SecretsConfigureOptions, SecretsReloadOptions, ServiceAutostartCommandOptions, SkillsInfoCommandOptions, SkillsInstalledCommandOptions, StartCommandOptions, StatusCommandOptions, UiCommandOptions, UpdateCommandOptions, UsageCommandOptions, readLearningLoopRuntimeConfig, runNextclawNpmRuntimeLauncher };
|
|
@@ -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();
|