@1mcp/agent 0.38.1 → 0.38.2
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/build/admin/assets/{admin-OAuthServicesWorkspace-C3DNmymC.js → admin-OAuthServicesWorkspace-BnEBXa_2.js} +1 -1
- package/build/admin/assets/{admin-console-BmdH0cQS.js → admin-console-5rVJC_G2.js} +3 -3
- package/build/admin/index.html +1 -1
- package/build/commands/serve/legacyRuntimeStop.d.ts +16 -0
- package/build/commands/serve/legacyRuntimeStop.d.ts.map +1 -0
- package/build/commands/serve/legacyRuntimeStop.js +143 -0
- package/build/commands/serve/legacyRuntimeStop.js.map +1 -0
- package/build/commands/serve/serveStatus.d.ts.map +1 -1
- package/build/commands/serve/serveStatus.js +8 -2
- package/build/commands/serve/serveStatus.js.map +1 -1
- package/build/commands/serve/serveStop.d.ts.map +1 -1
- package/build/commands/serve/serveStop.js +27 -3
- package/build/commands/serve/serveStop.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/core/server/legacyRuntimeRecovery.d.ts +14 -0
- package/build/core/server/legacyRuntimeRecovery.d.ts.map +1 -0
- package/build/core/server/legacyRuntimeRecovery.js +209 -0
- package/build/core/server/legacyRuntimeRecovery.js.map +1 -0
- package/build/core/server/processEvidence.d.ts +23 -0
- package/build/core/server/processEvidence.d.ts.map +1 -0
- package/build/core/server/processEvidence.js +114 -0
- package/build/core/server/processEvidence.js.map +1 -0
- package/build/core/server/runtimeLifecycle.d.ts.map +1 -1
- package/build/core/server/runtimeLifecycle.js +4 -1
- package/build/core/server/runtimeLifecycle.js.map +1 -1
- package/package.json +1 -1
package/build/admin/index.html
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
6
6
|
<link rel="icon" href="/admin/favicon.svg" type="image/svg+xml" />
|
|
7
7
|
<title>1MCP Admin Console</title>
|
|
8
|
-
<script type="module" crossorigin src="/admin/assets/admin-console-
|
|
8
|
+
<script type="module" crossorigin src="/admin/assets/admin-console-5rVJC_G2.js"></script>
|
|
9
9
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-rolldown-runtime-Bh1tDfsg.js">
|
|
10
10
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-react-BSaWeqgv.js">
|
|
11
11
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-mantine-xwbfu5Gd.js">
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type BackgroundSupervisorState } from '../../core/server/backgroundRuntimeSupervisorState.js';
|
|
2
|
+
import { verifyLegacyRuntimeOwner } from '../../core/server/legacyRuntimeRecovery.js';
|
|
3
|
+
import { type ServerPidInfo } from '../../core/server/pidFileManager.js';
|
|
4
|
+
import { readProcessEvidence } from '../../core/server/processEvidence.js';
|
|
5
|
+
import { type RuntimeScopeOwnershipRecord } from '../../core/server/runtimeScopeOwnership.js';
|
|
6
|
+
interface LegacyStopDependencies {
|
|
7
|
+
verify?: typeof verifyLegacyRuntimeOwner;
|
|
8
|
+
readEvidence?: typeof readProcessEvidence;
|
|
9
|
+
kill?: (pid: number, signal: 'SIGTERM' | 'SIGKILL') => void;
|
|
10
|
+
exists?: (pid: number) => boolean;
|
|
11
|
+
timeoutMs?: number;
|
|
12
|
+
}
|
|
13
|
+
/** Called only by explicit stop/restart while its Runtime Scope stop lock is held. */
|
|
14
|
+
export declare function stopLegacyRuntime(configDir: string, owner: RuntimeScopeOwnershipRecord, state: BackgroundSupervisorState, info: ServerPidInfo | null, dependencies?: LegacyStopDependencies): Promise<boolean>;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=legacyRuntimeStop.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacyRuntimeStop.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/legacyRuntimeStop.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,yBAAyB,EAG/B,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAA0B,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAC7G,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAwB,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAChG,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,2CAA2C,CAAC;AAEnD,UAAU,sBAAsB;IAC9B,MAAM,CAAC,EAAE,OAAO,wBAAwB,CAAC;IACzC,YAAY,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAC1C,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,SAAS,KAAK,IAAI,CAAC;IAC5D,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAWD,sFAAsF;AACtF,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,2BAA2B,EAClC,KAAK,EAAE,yBAAyB,EAChC,IAAI,EAAE,aAAa,GAAG,IAAI,EAC1B,YAAY,GAAE,sBAA2B,GACxC,OAAO,CAAC,OAAO,CAAC,CAuFlB"}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import { isDeepStrictEqual } from 'node:util';
|
|
3
|
+
import { cleanupBackgroundLaunchConfig } from '../../core/server/backgroundLaunchConfig.js';
|
|
4
|
+
import { cleanupBackgroundSupervisorState, readBackgroundSupervisorState, } from '../../core/server/backgroundRuntimeSupervisorState.js';
|
|
5
|
+
import { processEvidenceMatches, verifyLegacyRuntimeOwner } from '../../core/server/legacyRuntimeRecovery.js';
|
|
6
|
+
import { cleanupPidFileIfMatches, getPidFilePath, readPidFile, } from '../../core/server/pidFileManager.js';
|
|
7
|
+
import { readProcessEvidence } from '../../core/server/processEvidence.js';
|
|
8
|
+
import { readRuntimeScopeOwnership, releaseRuntimeScopeOwnership, } from '../../core/server/runtimeScopeOwnership.js';
|
|
9
|
+
function processExists(pid) {
|
|
10
|
+
try {
|
|
11
|
+
process.kill(pid, 0);
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
return !isMissingProcess(error);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
/** Called only by explicit stop/restart while its Runtime Scope stop lock is held. */
|
|
19
|
+
export async function stopLegacyRuntime(configDir, owner, state, info, dependencies = {}) {
|
|
20
|
+
const readEvidence = dependencies.readEvidence ?? readProcessEvidence;
|
|
21
|
+
const pair = (dependencies.verify ?? verifyLegacyRuntimeOwner)(configDir, owner, state, info, { readEvidence });
|
|
22
|
+
if (!pair || !info)
|
|
23
|
+
return false;
|
|
24
|
+
const kill = dependencies.kill ?? ((pid, signal) => process.kill(pid, signal));
|
|
25
|
+
const exists = dependencies.exists ?? processExists;
|
|
26
|
+
const checkMetadata = (allowMissing) => {
|
|
27
|
+
const currentOwner = readRuntimeScopeOwnership(configDir);
|
|
28
|
+
const currentState = readBackgroundSupervisorState(configDir);
|
|
29
|
+
const currentInfo = readPidFile(configDir);
|
|
30
|
+
const missingMetadata = !currentOwner || !currentState || !currentInfo;
|
|
31
|
+
if (!allowMissing && missingMetadata)
|
|
32
|
+
metadataChanged();
|
|
33
|
+
if (currentOwner && !isDeepStrictEqual(currentOwner, owner))
|
|
34
|
+
metadataChanged();
|
|
35
|
+
if (currentState && !matchesCapturedSupervisor(currentState, owner.pid, info.pid))
|
|
36
|
+
metadataChanged();
|
|
37
|
+
if (currentInfo && !isDeepStrictEqual(currentInfo, info))
|
|
38
|
+
metadataChanged();
|
|
39
|
+
if (!currentInfo && fs.existsSync(getPidFilePath(configDir)))
|
|
40
|
+
metadataChanged();
|
|
41
|
+
};
|
|
42
|
+
const status = (expected, allowReparent) => {
|
|
43
|
+
const observed = readEvidence(expected.pid);
|
|
44
|
+
if (!observed)
|
|
45
|
+
return exists(expected.pid) ? 'unknown' : 'dead';
|
|
46
|
+
if (observed.exited) {
|
|
47
|
+
// A zombie has already exited; Linux no longer exposes its mount namespace.
|
|
48
|
+
return matchesExitContext(expected.context, observed.context) ? 'dead' : 'unknown';
|
|
49
|
+
}
|
|
50
|
+
if (!isDeepStrictEqual(observed.context, expected.context))
|
|
51
|
+
return 'unknown';
|
|
52
|
+
if (observed.birth !== expected.birth)
|
|
53
|
+
return 'dead';
|
|
54
|
+
// Parent changes are expected only after the verified supervisor has exited.
|
|
55
|
+
const comparable = allowReparent ? { ...observed, ppid: expected.ppid } : observed;
|
|
56
|
+
return processEvidenceMatches(expected, comparable) ? 'alive' : 'unknown';
|
|
57
|
+
};
|
|
58
|
+
const wait = async (expected, allowReparent, timeout) => {
|
|
59
|
+
const deadline = Date.now() + timeout;
|
|
60
|
+
do {
|
|
61
|
+
const current = status(expected, allowReparent);
|
|
62
|
+
if (current === 'dead')
|
|
63
|
+
return true;
|
|
64
|
+
// Exit can fall between the paired snapshots. Wait for evidence to settle; never signal on uncertainty.
|
|
65
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
66
|
+
} while (Date.now() < deadline);
|
|
67
|
+
const current = status(expected, allowReparent);
|
|
68
|
+
if (current === 'unknown') {
|
|
69
|
+
throw new Error('Legacy process evidence became unavailable or changed; refusing further signals');
|
|
70
|
+
}
|
|
71
|
+
return current === 'dead';
|
|
72
|
+
};
|
|
73
|
+
const terminate = async (expected, supervisorExited) => {
|
|
74
|
+
for (const signal of ['SIGTERM', 'SIGKILL']) {
|
|
75
|
+
checkMetadata(supervisorExited || signal === 'SIGKILL');
|
|
76
|
+
const current = status(expected, supervisorExited);
|
|
77
|
+
if (current === 'dead')
|
|
78
|
+
return;
|
|
79
|
+
if (current !== 'alive')
|
|
80
|
+
throw new Error('Cannot revalidate legacy process before signalling');
|
|
81
|
+
if (!supervisorExited && signal === 'SIGTERM' && status(pair.worker, false) !== 'alive') {
|
|
82
|
+
throw new Error('Legacy worker changed before supervisor shutdown');
|
|
83
|
+
}
|
|
84
|
+
try {
|
|
85
|
+
kill(expected.pid, signal);
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
if (isMissingProcess(error) && status(expected, supervisorExited) === 'dead')
|
|
89
|
+
return;
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
92
|
+
const timeout = signal === 'SIGTERM' ? (dependencies.timeoutMs ?? 10000) : 2000;
|
|
93
|
+
if (await wait(expected, supervisorExited, timeout))
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
throw new Error('Legacy process did not exit; restart aborted');
|
|
97
|
+
};
|
|
98
|
+
checkMetadata(false);
|
|
99
|
+
await terminate(pair.supervisor, false);
|
|
100
|
+
checkMetadata(true);
|
|
101
|
+
await terminate(pair.worker, true);
|
|
102
|
+
checkMetadata(true);
|
|
103
|
+
if (!cleanupPidFileIfMatches(configDir, info))
|
|
104
|
+
throw new Error('Cannot clean verified legacy PID metadata');
|
|
105
|
+
checkMetadata(true);
|
|
106
|
+
if (!cleanupBackgroundLaunchConfig(configDir, owner.claimId))
|
|
107
|
+
throw new Error('Legacy launch configuration changed');
|
|
108
|
+
checkMetadata(true);
|
|
109
|
+
if (!cleanupBackgroundSupervisorState(configDir, owner.pid) && readBackgroundSupervisorState(configDir)) {
|
|
110
|
+
throw new Error('Legacy supervisor metadata changed');
|
|
111
|
+
}
|
|
112
|
+
checkMetadata(true);
|
|
113
|
+
if (readRuntimeScopeOwnership(configDir) && !releaseRuntimeScopeOwnership(configDir, owner)) {
|
|
114
|
+
throw new Error('Legacy ownership changed before release');
|
|
115
|
+
}
|
|
116
|
+
checkMetadata(true);
|
|
117
|
+
return true;
|
|
118
|
+
}
|
|
119
|
+
function metadataChanged() {
|
|
120
|
+
throw new Error('Legacy runtime ownership or worker changed; metadata retained and restart aborted');
|
|
121
|
+
}
|
|
122
|
+
function matchesCapturedSupervisor(state, supervisorPid, workerPid) {
|
|
123
|
+
if (state.supervisorPid !== supervisorPid)
|
|
124
|
+
return false;
|
|
125
|
+
if (state.runtimePid !== null && state.runtimePid !== workerPid)
|
|
126
|
+
return false;
|
|
127
|
+
if (state.supervisorIdentity || state.runtimeIdentity)
|
|
128
|
+
return false;
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
131
|
+
function matchesExitContext(expected, observed) {
|
|
132
|
+
if (observed.bootId !== expected.bootId)
|
|
133
|
+
return false;
|
|
134
|
+
return observed.pidNamespace === expected.pidNamespace;
|
|
135
|
+
}
|
|
136
|
+
function isMissingProcess(error) {
|
|
137
|
+
if (!(error instanceof Error))
|
|
138
|
+
return false;
|
|
139
|
+
if (!('code' in error))
|
|
140
|
+
return false;
|
|
141
|
+
return error.code === 'ESRCH';
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=legacyRuntimeStop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacyRuntimeStop.js","sourceRoot":"","sources":["../../../src/commands/serve/legacyRuntimeStop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAEL,gCAAgC,EAChC,6BAA6B,GAC9B,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAC7G,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,WAAW,GAEZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAwB,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAChG,OAAO,EACL,yBAAyB,EACzB,4BAA4B,GAE7B,MAAM,2CAA2C,CAAC;AAUnD,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,SAAiB,EACjB,KAAkC,EAClC,KAAgC,EAChC,IAA0B,EAC1B,eAAuC,EAAE;IAEzC,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,IAAI,mBAAmB,CAAC;IACtE,MAAM,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,wBAAwB,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAChH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACjC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/E,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,IAAI,aAAa,CAAC;IAEpD,MAAM,aAAa,GAAG,CAAC,YAAqB,EAAQ,EAAE;QACpD,MAAM,YAAY,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,6BAA6B,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,CAAC,YAAY,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC;QACvE,IAAI,CAAC,YAAY,IAAI,eAAe;YAAE,eAAe,EAAE,CAAC;QACxD,IAAI,YAAY,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,CAAC;YAAE,eAAe,EAAE,CAAC;QAC/E,IAAI,YAAY,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;YAAE,eAAe,EAAE,CAAC;QACrG,IAAI,WAAW,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC;YAAE,eAAe,EAAE,CAAC;QAC5E,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAAE,eAAe,EAAE,CAAC;IAClF,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,QAAyB,EAAE,aAAsB,EAAgC,EAAE;QACjG,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,4EAA4E;YAC5E,OAAO,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACrF,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;QAC7E,IAAI,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;YAAE,OAAO,MAAM,CAAC;QACrD,6EAA6E;QAC7E,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QACnF,OAAO,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,KAAK,EAAE,QAAyB,EAAE,aAAsB,EAAE,OAAe,EAAoB,EAAE;QAC1G,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;QACtC,GAAG,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YAChD,IAAI,OAAO,KAAK,MAAM;gBAAE,OAAO,IAAI,CAAC;YACpC,wGAAwG;YACxG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3D,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE;QAChC,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAChD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;QACrG,CAAC;QACD,OAAO,OAAO,KAAK,MAAM,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,EAAE,QAAyB,EAAE,gBAAyB,EAAiB,EAAE;QAC9F,KAAK,MAAM,MAAM,IAAI,CAAC,SAAS,EAAE,SAAS,CAAU,EAAE,CAAC;YACrD,aAAa,CAAC,gBAAgB,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;YACnD,IAAI,OAAO,KAAK,MAAM;gBAAE,OAAO;YAC/B,IAAI,OAAO,KAAK,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;YAC/F,IAAI,CAAC,gBAAgB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,OAAO,EAAE,CAAC;gBACxF,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;YACD,IAAI,CAAC;gBACH,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,MAAM;oBAAE,OAAO;gBACrF,MAAM,KAAK,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAChF,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC;gBAAE,OAAO;QAC9D,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC,CAAC;IAEF,aAAa,CAAC,KAAK,CAAC,CAAC;IACrB,MAAM,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACxC,aAAa,CAAC,IAAI,CAAC,CAAC;IACpB,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnC,aAAa,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC5G,aAAa,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,CAAC,6BAA6B,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACrH,aAAa,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,CAAC,gCAAgC,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,6BAA6B,CAAC,SAAS,CAAC,EAAE,CAAC;QACxG,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,aAAa,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,yBAAyB,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QAC5F,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,aAAa,CAAC,IAAI,CAAC,CAAC;IACpB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe;IACtB,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;AACvG,CAAC;AAED,SAAS,yBAAyB,CAChC,KAAgC,EAChC,aAAqB,EACrB,SAAiB;IAEjB,IAAI,KAAK,CAAC,aAAa,KAAK,aAAa;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC9E,IAAI,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,eAAe;QAAE,OAAO,KAAK,CAAC;IACpE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAoC,EAAE,QAAoC;IACpG,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACtD,OAAO,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC,YAAY,CAAC;AACzD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACrC,OAAO,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStatus.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EACL,yBAAyB,EACzB,iCAAiC,EAEjC,KAAK,2BAA2B,EACjC,MAAM,2CAA2C,CAAC;AAEnD;;;;;GAKG;AAEH,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAE1F,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,oEAAoE;IACpE,SAAS,CAAC,EAAE,2BAA2B,CAAC;IACxC,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAQhE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,CAAC,EAAE,OAAO,6BAA6B,CAAC;IAC3D,sBAAsB,CAAC,EAAE,OAAO,gCAAgC,CAAC;IACjE,eAAe,CAAC,EAAE,OAAO,sBAAsB,CAAC;IAChD,eAAe,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACjD,gBAAgB,CAAC,EAAE,OAAO,iCAAiC,CAAC;CAC7D;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,eAAe,CAAC,EAAE,MAAM,EACxB,IAAI,GAAE,iBAAsB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"serveStatus.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EACL,yBAAyB,EACzB,iCAAiC,EAEjC,KAAK,2BAA2B,EACjC,MAAM,2CAA2C,CAAC;AAEnD;;;;;GAKG;AAEH,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAE1F,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,oEAAoE;IACpE,SAAS,CAAC,EAAE,2BAA2B,CAAC;IACxC,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAQhE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,CAAC,EAAE,OAAO,6BAA6B,CAAC;IAC3D,sBAAsB,CAAC,EAAE,OAAO,gCAAgC,CAAC;IACjE,eAAe,CAAC,EAAE,OAAO,sBAAsB,CAAC;IAChD,eAAe,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACjD,gBAAgB,CAAC,EAAE,OAAO,iCAAiC,CAAC;CAC7D;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,eAAe,CAAC,EAAE,MAAM,EACxB,IAAI,GAAE,iBAAsB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAgG9B;AA4ED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CA+C7E;AA8BD;;GAEG;AACH,wBAAsB,cAAc,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5E"}
|
|
@@ -39,7 +39,10 @@ export async function getRuntimeStatusReport(configDirOption, deps = {}) {
|
|
|
39
39
|
? 'dead'
|
|
40
40
|
: inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity);
|
|
41
41
|
if (supervisorStatus === 'unknown' || runtimeStatus === 'unknown') {
|
|
42
|
-
return statusError(configDir, new Error('Cannot verify supervisor or worker process identity; lifecycle metadata was retained'
|
|
42
|
+
return statusError(configDir, new Error('Cannot verify supervisor or worker process identity; lifecycle metadata was retained' +
|
|
43
|
+
(!supervisorState.supervisorIdentity && !supervisorState.runtimeIdentity
|
|
44
|
+
? '. Legacy metadata requires explicit recovery. On Linux, a live supervised pair with complete scope metadata can use 1mcp serve --restart with the same --config-dir. On macOS/Windows, stop the verified old runtime using its original CLI or service manager before restarting with the new CLI; retain metadata until all scope participants have stopped.'
|
|
45
|
+
: '')));
|
|
43
46
|
}
|
|
44
47
|
const supervisorAlive = supervisorStatus === 'alive';
|
|
45
48
|
const runtimeAlive = runtimeStatus === 'alive';
|
|
@@ -118,7 +121,10 @@ async function discoverRuntimeWithOwnership(configDir, deps) {
|
|
|
118
121
|
}
|
|
119
122
|
const ownerStatus = deps.inspectIdentity(ownership.pid, ownership.processIdentity);
|
|
120
123
|
if (ownerStatus === 'unknown')
|
|
121
|
-
return statusError(configDir, new Error('Cannot verify Runtime Scope owner identity; lifecycle metadata was retained'
|
|
124
|
+
return statusError(configDir, new Error('Cannot verify Runtime Scope owner identity; lifecycle metadata was retained' +
|
|
125
|
+
(!ownership.processIdentity
|
|
126
|
+
? '. Legacy ownership-only metadata cannot prove a live supervisor/worker pair. Stop the original runtime using its original CLI or service manager; verify all scope participants have stopped before manual metadata cleanup.'
|
|
127
|
+
: '')));
|
|
122
128
|
if (ownerStatus === 'alive') {
|
|
123
129
|
return { status: 'unreachable', configDir, info: null, ownership };
|
|
124
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStatus.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAEL,gCAAgC,EAChC,6BAA6B,GAC9B,MAAM,iDAAiD,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAiB,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EACL,yBAAyB,EACzB,iCAAiC,EACjC,sBAAsB,GAEvB,MAAM,2CAA2C,CAAC;AAyBnD,kFAAkF;AAClF,MAAM,CAAC,MAAM,iBAAiB,GAAuC;IACnE,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,CAAC;IACR,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,CAAC;IACf,QAAQ,EAAE,CAAC;CACZ,CAAC;AAWF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,eAAwB,EACxB,OAA0B,EAAE;IAE5B,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAChD,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,6BAA6B,CAAC;IACtF,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,IAAI,gCAAgC,CAAC;IAC/F,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,sBAAsB,CAAC;IACvE,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,qBAAqB,CAAC;IACtE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,yBAAyB,CAAC;IACtE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,iCAAiC,CAAC;IAEpF,IAAI,eAAiD,CAAC;IACtD,IAAI,CAAC;QACH,eAAe,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC5G,MAAM,aAAa,GACjB,eAAe,CAAC,UAAU,KAAK,IAAI;YACjC,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QACnF,IAAI,gBAAgB,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAClE,OAAO,WAAW,CAChB,SAAS,EACT,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"serveStatus.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStop.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAKL,WAAW,EAEZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAwB,MAAM,qCAAqC,CAAC;AACnG,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EAI1B,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"serveStop.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAKL,WAAW,EAEZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAwB,MAAM,qCAAqC,CAAC;AACnG,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EAI1B,MAAM,2CAA2C,CAAC;AAKnD;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wFAAwF;AACxF,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,CAexG;AAED,uDAAuD;AACvD,KAAK,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAExC,MAAM,WAAW,WAAW;IAC1B,eAAe,CAAC,EAAE,OAAO,sBAAsB,CAAC;IAChD,mBAAmB,CAAC,EAAE,OAAO,6BAA6B,CAAC;IAC3D,aAAa,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACjD,eAAe,CAAC,EAAE,OAAO,2BAA2B,CAAC;IACrD,sBAAsB,CAAC,EAAE,OAAO,gCAAgC,CAAC;IACjE,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,KAAK,OAAO,CAAC;IACpF,8EAA8E;IAC9E,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,KAAK,OAAO,CAAC;IACjF,QAAQ,CAAC,EAAE,OAAO,WAAW,CAAC;IAC9B,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,oEAAoE;IACpE,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9D,WAAW,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACxC,kDAAkD;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAwDD;;GAEG;AACH,wBAAsB,YAAY,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4UlG"}
|
|
@@ -6,6 +6,7 @@ import { cleanupPidFileIfMatches, getPidFilePath, isProcessAlive, PidFileReadErr
|
|
|
6
6
|
import { inspectProcessIdentity } from '../../core/server/processIdentity.js';
|
|
7
7
|
import { acquireRuntimeScopeStopLock, readRuntimeScopeOwnership, releaseRuntimeScopeOwnership, } from '../../core/server/runtimeScopeOwnership.js';
|
|
8
8
|
import logger from '../../logger/logger.js';
|
|
9
|
+
import { stopLegacyRuntime } from './legacyRuntimeStop.js';
|
|
9
10
|
/** Poll until the process is gone or the timeout elapses. Returns true if it exited. */
|
|
10
11
|
export async function waitForProcessExit(pid, options = {}) {
|
|
11
12
|
const timeoutMs = options.timeoutMs ?? 10000;
|
|
@@ -166,8 +167,9 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
166
167
|
return;
|
|
167
168
|
}
|
|
168
169
|
try {
|
|
170
|
+
let initialInfo;
|
|
169
171
|
try {
|
|
170
|
-
|
|
172
|
+
initialInfo = readInfo(configDir);
|
|
171
173
|
if (supervisorState.runtimePid !== null &&
|
|
172
174
|
!runtimeMetadataMatches(initialInfo, supervisorState.runtimePid, supervisorState.runtimeIdentity)) {
|
|
173
175
|
throw new Error('runtime PID metadata conflicts with supervisor state');
|
|
@@ -188,7 +190,26 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
188
190
|
? 'dead'
|
|
189
191
|
: inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity);
|
|
190
192
|
if (supervisorStatus === 'unknown' || workerStatus === 'unknown') {
|
|
191
|
-
|
|
193
|
+
if (!owner.processIdentity &&
|
|
194
|
+
!supervisorState.supervisorIdentity &&
|
|
195
|
+
!supervisorState.runtimeIdentity &&
|
|
196
|
+
!initialInfo?.processIdentity) {
|
|
197
|
+
try {
|
|
198
|
+
if (await stopLegacyRuntime(configDir, owner, supervisorState, initialInfo)) {
|
|
199
|
+
process.stdout.write(`Stopped verified legacy background runtime in Runtime Scope ${configDir}.\n`);
|
|
200
|
+
process.exitCode = 0;
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
catch (error) {
|
|
205
|
+
failStop(`legacy runtime recovery aborted: ${errorMessage(error)}`);
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
failStop(`cannot verify process identity in Runtime Scope ${configDir}; refusing ambiguous stop. ` +
|
|
210
|
+
(!owner.processIdentity
|
|
211
|
+
? 'Legacy metadata has no process identity; automatic recovery requires a verified live pair on Linux. Stop the old runtime using its original CLI or service manager; verify all scope participants have stopped before manual metadata recovery.'
|
|
212
|
+
: ''));
|
|
192
213
|
return;
|
|
193
214
|
}
|
|
194
215
|
const supervisorWasAlive = supervisorStatus === 'alive';
|
|
@@ -310,7 +331,10 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
310
331
|
// Stale dead-process PID file: clean it up and report cleanly.
|
|
311
332
|
const identityStatus = inspectIdentity(info.pid, info.processIdentity);
|
|
312
333
|
if (identityStatus === 'unknown') {
|
|
313
|
-
failStop(`cannot verify process identity for Runtime Scope PID ${info.pid}; refusing ambiguous stop.`
|
|
334
|
+
failStop(`cannot verify process identity for Runtime Scope PID ${info.pid}; refusing ambiguous stop.` +
|
|
335
|
+
(!info.processIdentity
|
|
336
|
+
? ' Legacy foreground or unverifiable runtimes require stopping through the original CLI or service manager. Verify all scope participants have stopped before manual metadata cleanup.'
|
|
337
|
+
: ''));
|
|
314
338
|
return;
|
|
315
339
|
}
|
|
316
340
|
if (identityStatus === 'dead') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStop.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"serveStop.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"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"}
|
package/build/constants/mcp.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
|
6
6
|
export declare const APP_CONFIG_FILE = "config.toml";
|
|
7
7
|
export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
|
|
8
8
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
9
|
-
export declare const MCP_SERVER_VERSION = "0.38.
|
|
9
|
+
export declare const MCP_SERVER_VERSION = "0.38.2";
|
|
10
10
|
export declare const MCP_PROJECT_METADATA: {
|
|
11
11
|
readonly repository: "https://github.com/1mcp-app/agent";
|
|
12
12
|
readonly documentation: "https://docs.1mcp.app";
|
package/build/constants/mcp.js
CHANGED
|
@@ -3,7 +3,7 @@ export const MCP_CONFIG_FILE = 'mcp.json';
|
|
|
3
3
|
export const APP_CONFIG_FILE = 'config.toml';
|
|
4
4
|
export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
|
|
5
5
|
export const MCP_SERVER_NAME = '1mcp';
|
|
6
|
-
export const MCP_SERVER_VERSION = '0.38.
|
|
6
|
+
export const MCP_SERVER_VERSION = '0.38.2';
|
|
7
7
|
// Compiled with every artifact so Admin Console metadata does not depend on
|
|
8
8
|
// package.json being adjacent to the runtime entrypoint.
|
|
9
9
|
export const MCP_PROJECT_METADATA = {
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type BackgroundSupervisorState } from './backgroundRuntimeSupervisorState.js';
|
|
2
|
+
import { type ServerPidInfo } from './pidFileManager.js';
|
|
3
|
+
import { type ProcessEvidence, readProcessEvidence } from './processEvidence.js';
|
|
4
|
+
import type { RuntimeScopeOwnershipRecord } from './runtimeScopeOwnership.js';
|
|
5
|
+
/** Evidence is operation-local, never a replacement for persisted modern identity. */
|
|
6
|
+
export declare function processEvidenceMatches(expected: ProcessEvidence, observed: ProcessEvidence | undefined): boolean;
|
|
7
|
+
/** Read-only proof for the narrow, identity-less, supervised legacy shape. */
|
|
8
|
+
export declare function verifyLegacyRuntimeOwner(configDir: string, owner: RuntimeScopeOwnershipRecord | null, supervisorState: BackgroundSupervisorState | null, pidInfo: ServerPidInfo | null, dependencies?: {
|
|
9
|
+
readEvidence?: typeof readProcessEvidence;
|
|
10
|
+
}): {
|
|
11
|
+
supervisor: ProcessEvidence;
|
|
12
|
+
worker: ProcessEvidence;
|
|
13
|
+
} | undefined;
|
|
14
|
+
//# sourceMappingURL=legacyRuntimeRecovery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacyRuntimeRecovery.d.ts","sourceRoot":"","sources":["../../../src/core/server/legacyRuntimeRecovery.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAE9E,sFAAsF;AACtF,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,CAEhH;AAED,8EAA8E;AAC9E,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,2BAA2B,GAAG,IAAI,EACzC,eAAe,EAAE,yBAAyB,GAAG,IAAI,EACjD,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,YAAY,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,mBAAmB,CAAA;CAAO,GAC/D;IAAE,UAAU,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,SAAS,CA8DtE"}
|