@zcloak/ai-agent 1.0.29 → 1.0.31
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/SKILL.md +1 -1
- package/dist/cli.js +48 -13
- package/dist/cli.js.map +1 -1
- package/dist/daemon.d.ts +7 -7
- package/dist/daemon.js +9 -8
- package/dist/daemon.js.map +1 -1
- package/dist/log.js +2 -2
- package/dist/log.js.map +1 -1
- package/dist/paths.d.ts +2 -2
- package/dist/paths.js +3 -3
- package/dist/paths.js.map +1 -1
- package/dist/pre-check.js +35 -0
- package/dist/pre-check.js.map +1 -1
- package/dist/rpc.d.ts +4 -2
- package/dist/rpc.js +1 -1
- package/dist/rpc.js.map +1 -1
- package/dist/serve.d.ts +4 -3
- package/dist/serve.js +25 -12
- package/dist/serve.js.map +1 -1
- package/dist/types/registry.d.ts +1 -1
- package/dist/types/registry.js +1 -1
- package/dist/types/sign-event.d.ts +1 -1
- package/dist/types/sign-event.js +1 -1
- package/dist/vetkey.d.ts +5 -4
- package/dist/vetkey.js +34 -24
- package/dist/vetkey.js.map +1 -1
- package/dist/zmail.js +8 -3
- package/dist/zmail.js.map +1 -1
- package/package.json +1 -1
package/SKILL.md
CHANGED
package/dist/cli.js
CHANGED
|
@@ -36,11 +36,12 @@ import { fileURLToPath } from 'url';
|
|
|
36
36
|
import { Session } from './session.js';
|
|
37
37
|
import { preCheck } from './pre-check.js';
|
|
38
38
|
import { DEFAULT_PEM_PATH, loadIdentityFromPath } from './identity.js';
|
|
39
|
-
import {
|
|
40
|
-
import { isDaemonAlive } from './daemon.js';
|
|
39
|
+
import { startDaemonBackground, stopAllDaemons } from './vetkey.js';
|
|
40
|
+
import { isDaemonAlive, runtimeDir, sanitizeDerivationId } from './daemon.js';
|
|
41
41
|
import * as log from './log.js';
|
|
42
42
|
/** ESM equivalent of __dirname */
|
|
43
43
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
44
|
+
const DAEMON_START_LOCK_TTL_MS = 30000;
|
|
44
45
|
/** Supported modules and their corresponding script files (compiled in dist/ directory) */
|
|
45
46
|
const MODULES = {
|
|
46
47
|
identity: 'identity_cmd',
|
|
@@ -56,6 +57,36 @@ const MODULES = {
|
|
|
56
57
|
social: 'social',
|
|
57
58
|
zmail: 'zmail',
|
|
58
59
|
};
|
|
60
|
+
function daemonStartLockPath(derivationId) {
|
|
61
|
+
return path.join(runtimeDir(), `${sanitizeDerivationId(derivationId)}.starting.lock`);
|
|
62
|
+
}
|
|
63
|
+
function tryAcquireDaemonStartLock(derivationId) {
|
|
64
|
+
const lockPath = daemonStartLockPath(derivationId);
|
|
65
|
+
try {
|
|
66
|
+
fs.mkdirSync(runtimeDir(), { recursive: true });
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
try {
|
|
72
|
+
const stat = fs.statSync(lockPath);
|
|
73
|
+
const ageMs = Date.now() - stat.mtimeMs;
|
|
74
|
+
if (ageMs < DAEMON_START_LOCK_TTL_MS) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
fs.unlinkSync(lockPath);
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
// No existing lock (or unreadable lock) — continue and try to create one.
|
|
81
|
+
}
|
|
82
|
+
try {
|
|
83
|
+
fs.writeFileSync(lockPath, String(Date.now()), { flag: 'wx' });
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
59
90
|
function showHelp() {
|
|
60
91
|
console.log('zCloak.ai Agent CLI');
|
|
61
92
|
console.log('');
|
|
@@ -181,17 +212,21 @@ async function main() {
|
|
|
181
212
|
catch {
|
|
182
213
|
return; // Identity load failed — skip warm-up
|
|
183
214
|
}
|
|
184
|
-
// Step 5:
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
215
|
+
// Step 5: Start the per-principal daemon if needed
|
|
216
|
+
if (isDaemonAlive(principal))
|
|
217
|
+
return;
|
|
218
|
+
if (!tryAcquireDaemonStartLock(principal)) {
|
|
219
|
+
log.debug('Daemon warm-up skipped because start lock is already held', {
|
|
220
|
+
principal,
|
|
221
|
+
lockPath: daemonStartLockPath(principal),
|
|
222
|
+
});
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
try {
|
|
226
|
+
startDaemonBackground(pemPath, principal);
|
|
227
|
+
}
|
|
228
|
+
catch {
|
|
229
|
+
// Best-effort — ignore spawn failures
|
|
195
230
|
}
|
|
196
231
|
})();
|
|
197
232
|
// Load and execute sub-script's run() function.
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon.d.ts
CHANGED
|
@@ -16,23 +16,23 @@
|
|
|
16
16
|
*/
|
|
17
17
|
export { runtimeDir } from './paths.js';
|
|
18
18
|
/**
|
|
19
|
-
* Sanitize a
|
|
19
|
+
* Sanitize a daemon identifier for use in file names.
|
|
20
20
|
*
|
|
21
21
|
* Replaces special characters (:, /, \) with underscores.
|
|
22
22
|
* If the resulting path would exceed the Unix socket path limit,
|
|
23
23
|
* falls back to a SHA-256 hash prefix (16 hex characters) to keep
|
|
24
24
|
* the path short enough.
|
|
25
25
|
*
|
|
26
|
-
* @param derivationId - Raw
|
|
26
|
+
* @param derivationId - Raw daemon ID (for example a principal or "{principal}:{key_name}")
|
|
27
27
|
* @returns Safe file name prefix
|
|
28
28
|
*/
|
|
29
29
|
export declare function sanitizeDerivationId(derivationId: string): string;
|
|
30
|
-
/** Get the socket file path for a
|
|
30
|
+
/** Get the socket file path for a daemon ID */
|
|
31
31
|
export declare function socketPath(derivationId: string): string;
|
|
32
|
-
/** Get the PID file path for a
|
|
32
|
+
/** Get the PID file path for a daemon ID */
|
|
33
33
|
export declare function pidPath(derivationId: string): string;
|
|
34
34
|
/**
|
|
35
|
-
* Check whether a daemon for the given
|
|
35
|
+
* Check whether a daemon for the given daemon ID is alive.
|
|
36
36
|
*
|
|
37
37
|
* Returns a simple boolean — suitable for pre-checks where the caller wants to
|
|
38
38
|
* decide whether to auto-start a daemon without catching exceptions.
|
|
@@ -47,7 +47,7 @@ export declare function pidPath(derivationId: string): string;
|
|
|
47
47
|
* If stale PID/socket files are found (process confirmed dead), they are
|
|
48
48
|
* cleaned up.
|
|
49
49
|
*
|
|
50
|
-
* @param derivationId -
|
|
50
|
+
* @param derivationId - Daemon ID (for example "{principal}:Mail" or just "{principal}")
|
|
51
51
|
* @returns true if the daemon is (or may be) running and connectable
|
|
52
52
|
*/
|
|
53
53
|
export declare function isDaemonAlive(derivationId: string): boolean;
|
|
@@ -75,7 +75,7 @@ export declare class DaemonRuntime {
|
|
|
75
75
|
/**
|
|
76
76
|
* Create a new DaemonRuntime, performing all startup checks.
|
|
77
77
|
*
|
|
78
|
-
* @param derivationId -
|
|
78
|
+
* @param derivationId - Daemon ID for this daemon instance
|
|
79
79
|
* @returns Initialized DaemonRuntime
|
|
80
80
|
* @throws ToolError with code DAEMON if another instance is already running
|
|
81
81
|
*/
|
package/dist/daemon.js
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from 'fs';
|
|
18
18
|
import { join } from 'path';
|
|
19
19
|
import crypto from 'crypto';
|
|
20
|
+
import { daemonError } from './error.js';
|
|
20
21
|
import * as log from './log.js';
|
|
21
22
|
import { runtimeDir as _runtimeDir } from './paths.js';
|
|
22
23
|
// Re-export runtimeDir from paths.ts so existing consumers (tests, vetkey.ts)
|
|
@@ -32,14 +33,14 @@ const MAX_SOCKET_PATH_LEN = 100;
|
|
|
32
33
|
// Path Utilities
|
|
33
34
|
// ============================================================================
|
|
34
35
|
/**
|
|
35
|
-
* Sanitize a
|
|
36
|
+
* Sanitize a daemon identifier for use in file names.
|
|
36
37
|
*
|
|
37
38
|
* Replaces special characters (:, /, \) with underscores.
|
|
38
39
|
* If the resulting path would exceed the Unix socket path limit,
|
|
39
40
|
* falls back to a SHA-256 hash prefix (16 hex characters) to keep
|
|
40
41
|
* the path short enough.
|
|
41
42
|
*
|
|
42
|
-
* @param derivationId - Raw
|
|
43
|
+
* @param derivationId - Raw daemon ID (for example a principal or "{principal}:{key_name}")
|
|
43
44
|
* @returns Safe file name prefix
|
|
44
45
|
*/
|
|
45
46
|
export function sanitizeDerivationId(derivationId) {
|
|
@@ -57,12 +58,12 @@ export function sanitizeDerivationId(derivationId) {
|
|
|
57
58
|
}
|
|
58
59
|
return sanitized;
|
|
59
60
|
}
|
|
60
|
-
/** Get the socket file path for a
|
|
61
|
+
/** Get the socket file path for a daemon ID */
|
|
61
62
|
export function socketPath(derivationId) {
|
|
62
63
|
const name = sanitizeDerivationId(derivationId);
|
|
63
64
|
return join(_runtimeDir(), `${name}.sock`);
|
|
64
65
|
}
|
|
65
|
-
/** Get the PID file path for a
|
|
66
|
+
/** Get the PID file path for a daemon ID */
|
|
66
67
|
export function pidPath(derivationId) {
|
|
67
68
|
const name = sanitizeDerivationId(derivationId);
|
|
68
69
|
return join(_runtimeDir(), `${name}.pid`);
|
|
@@ -95,7 +96,7 @@ function isProcessAlive(pid) {
|
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
/**
|
|
98
|
-
* Check whether a daemon for the given
|
|
99
|
+
* Check whether a daemon for the given daemon ID is alive.
|
|
99
100
|
*
|
|
100
101
|
* Returns a simple boolean — suitable for pre-checks where the caller wants to
|
|
101
102
|
* decide whether to auto-start a daemon without catching exceptions.
|
|
@@ -110,7 +111,7 @@ function isProcessAlive(pid) {
|
|
|
110
111
|
* If stale PID/socket files are found (process confirmed dead), they are
|
|
111
112
|
* cleaned up.
|
|
112
113
|
*
|
|
113
|
-
* @param derivationId -
|
|
114
|
+
* @param derivationId - Daemon ID (for example "{principal}:Mail" or just "{principal}")
|
|
114
115
|
* @returns true if the daemon is (or may be) running and connectable
|
|
115
116
|
*/
|
|
116
117
|
export function isDaemonAlive(derivationId) {
|
|
@@ -169,7 +170,7 @@ export class DaemonRuntime {
|
|
|
169
170
|
/**
|
|
170
171
|
* Create a new DaemonRuntime, performing all startup checks.
|
|
171
172
|
*
|
|
172
|
-
* @param derivationId -
|
|
173
|
+
* @param derivationId - Daemon ID for this daemon instance
|
|
173
174
|
* @returns Initialized DaemonRuntime
|
|
174
175
|
* @throws ToolError with code DAEMON if another instance is already running
|
|
175
176
|
*/
|
|
@@ -187,7 +188,7 @@ export class DaemonRuntime {
|
|
|
187
188
|
const pidStr = readFileSync(pid, "utf-8").trim();
|
|
188
189
|
const existingPid = parseInt(pidStr, 10);
|
|
189
190
|
if (!isNaN(existingPid) && isProcessAlive(existingPid)) {
|
|
190
|
-
|
|
191
|
+
throw daemonError(`daemon already running for "${derivationId}" (PID ${existingPid})`);
|
|
191
192
|
}
|
|
192
193
|
}
|
|
193
194
|
catch (e) {
|
package/dist/daemon.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"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"}
|
package/dist/log.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
|
-
import {
|
|
2
|
+
import { debugLogPath, runtimeDir } from './paths.js';
|
|
3
3
|
function isDebugEnabled() {
|
|
4
4
|
const value = process.env.ZCLOAK_DEBUG?.trim().toLowerCase();
|
|
5
5
|
if (!value)
|
|
@@ -26,7 +26,7 @@ function write(level, parts) {
|
|
|
26
26
|
const entry = `[zcloak-ai] ${timestamp} ${level} ${line}\n`;
|
|
27
27
|
process.stderr.write(entry);
|
|
28
28
|
try {
|
|
29
|
-
fs.mkdirSync(
|
|
29
|
+
fs.mkdirSync(runtimeDir(), { recursive: true });
|
|
30
30
|
fs.appendFileSync(debugLogPath(), entry, 'utf-8');
|
|
31
31
|
}
|
|
32
32
|
catch {
|
package/dist/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEtD,SAAS,cAAc;IACrB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7D,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,KAAK,CAAC;AACjF,CAAC;AAED,SAAS,UAAU,CAAC,IAAa;IAC/B,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,KAA0C,EAAE,KAAgB;IACzE,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,eAAe,SAAS,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC;IAE5D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAE5B,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,EAAE,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;IACpD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAG,KAAgB;IACvC,IAAI,CAAC,cAAc,EAAE;QAAE,OAAO;IAC9B,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,GAAG,KAAgB;IACtC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,GAAG,KAAgB;IACtC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAG,KAAgB;IACvC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AACxB,CAAC"}
|
package/dist/paths.d.ts
CHANGED
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
* Directory layout:
|
|
8
8
|
* ~/.config/zcloak/
|
|
9
9
|
* ai-id.pem Identity PEM file
|
|
10
|
-
* debug.log Debug log file
|
|
11
10
|
* .last-update-check Update check timestamp
|
|
12
11
|
* run/ Daemon runtime files (PID, socket, logs)
|
|
12
|
+
* debug.log Shared debug log file
|
|
13
13
|
* {sanitized_id}.pid
|
|
14
14
|
* {sanitized_id}.sock
|
|
15
15
|
* {keyname}-daemon.log
|
|
@@ -26,7 +26,7 @@ export declare function runtimeDir(): string;
|
|
|
26
26
|
export declare function mailboxesRoot(): string;
|
|
27
27
|
/** Default identity PEM file path: ~/.config/zcloak/ai-id.pem */
|
|
28
28
|
export declare function defaultPemPath(): string;
|
|
29
|
-
/** Debug log file path: ~/.config/zcloak/debug.log */
|
|
29
|
+
/** Debug log file path: ~/.config/zcloak/run/debug.log */
|
|
30
30
|
export declare function debugLogPath(): string;
|
|
31
31
|
/** Daemon log file path for a given key name: ~/.config/zcloak/run/{keyname}-daemon.log */
|
|
32
32
|
export declare function daemonLogPath(keyName: string): string;
|
package/dist/paths.js
CHANGED
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
* Directory layout:
|
|
8
8
|
* ~/.config/zcloak/
|
|
9
9
|
* ai-id.pem Identity PEM file
|
|
10
|
-
* debug.log Debug log file
|
|
11
10
|
* .last-update-check Update check timestamp
|
|
12
11
|
* run/ Daemon runtime files (PID, socket, logs)
|
|
12
|
+
* debug.log Shared debug log file
|
|
13
13
|
* {sanitized_id}.pid
|
|
14
14
|
* {sanitized_id}.sock
|
|
15
15
|
* {keyname}-daemon.log
|
|
@@ -45,9 +45,9 @@ export function defaultPemPath() {
|
|
|
45
45
|
// ============================================================================
|
|
46
46
|
// Logging
|
|
47
47
|
// ============================================================================
|
|
48
|
-
/** Debug log file path: ~/.config/zcloak/debug.log */
|
|
48
|
+
/** Debug log file path: ~/.config/zcloak/run/debug.log */
|
|
49
49
|
export function debugLogPath() {
|
|
50
|
-
return join(
|
|
50
|
+
return join(runtimeDir(), 'debug.log');
|
|
51
51
|
}
|
|
52
52
|
/** Daemon log file path for a given key name: ~/.config/zcloak/run/{keyname}-daemon.log */
|
|
53
53
|
export function daemonLogPath(keyName) {
|
package/dist/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,+EAA+E;AAC/E,mBAAmB;AACnB,+EAA+E;AAE/E,sDAAsD;AACtD,MAAM,UAAU,SAAS;IACvB,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,UAAU;IACxB,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC;AACxC,CAAC;AAED,+EAA+E;AAC/E,WAAW;AACX,+EAA+E;AAE/E,iEAAiE;AACjE,MAAM,UAAU,cAAc;IAC5B,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC;AACxC,CAAC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,+EAA+E;AAC/E,mBAAmB;AACnB,+EAA+E;AAE/E,sDAAsD;AACtD,MAAM,UAAU,SAAS;IACvB,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,UAAU;IACxB,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC;AACxC,CAAC;AAED,+EAA+E;AAC/E,WAAW;AACX,+EAA+E;AAE/E,iEAAiE;AACjE,MAAM,UAAU,cAAc;IAC5B,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC;AACxC,CAAC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,0DAA0D;AAC1D,MAAM,UAAU,YAAY;IAC1B,OAAO,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,CAAC;AACzC,CAAC;AAED,2FAA2F;AAC3F,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AACnE,CAAC;AAED,+EAA+E;AAC/E,eAAe;AACf,+EAA+E;AAE/E,4EAA4E;AAC5E,MAAM,UAAU,mBAAmB;IACjC,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,oBAAoB,CAAC,CAAC;AACjD,CAAC;AAED,+EAA+E;AAC/E,8BAA8B;AAC9B,+EAA+E;AAE/E,uFAAuF;AACvF,MAAM,UAAU,UAAU,CAAC,SAAiB;IAC1C,OAAO,IAAI,CAAC,aAAa,EAAE,EAAE,SAAS,CAAC,CAAC;AAC1C,CAAC"}
|
package/dist/pre-check.js
CHANGED
|
@@ -41,6 +41,17 @@ const CONFIG_DIR = getConfigDir();
|
|
|
41
41
|
const CHECK_FILE = lastUpdateCheckPath();
|
|
42
42
|
/** Workspace SKILL.md path expected by openClaw. */
|
|
43
43
|
const WORKSPACE_SKILL_PATH = path.resolve(process.cwd(), "skills", "zcloak-ai-agent", "SKILL.md");
|
|
44
|
+
/** Optional workspace TOOLS.md path in the current working directory. */
|
|
45
|
+
const WORKSPACE_TOOLS_PATH = path.resolve(process.cwd(), "TOOLS.md");
|
|
46
|
+
/** Marker string that indicates TOOLS.md already references the zCloak skill. */
|
|
47
|
+
const TOOLS_MD_ZCLOAK_SKILL_MARKER = "zcloak-ai-agent";
|
|
48
|
+
/** Instruction appended when the current workspace TOOLS.md is missing the zCloak skill entry. */
|
|
49
|
+
const TOOLS_MD_ZCLOAK_SKILL_APPEND_HINT = [
|
|
50
|
+
"append <claw_workspace>/TOOLS.md：",
|
|
51
|
+
"## zCloak.ai SKILL",
|
|
52
|
+
"- Skill path: /home/ubuntu/clawd/skills/zcloak-ai-agent/SKILL.md",
|
|
53
|
+
"- Used for all zCloak-related operations: zMail, identity creation, signing, 2FA-protected delete, on-chain actions, encryption, etc.",
|
|
54
|
+
].join("\n");
|
|
44
55
|
// ---------------------------------------------------------------------------
|
|
45
56
|
// Tuning constants
|
|
46
57
|
// ---------------------------------------------------------------------------
|
|
@@ -56,6 +67,24 @@ const NPM_PACKAGE_NAME = "@zcloak/ai-agent";
|
|
|
56
67
|
const SKILL_MD_URL = "https://raw.githubusercontent.com/zCloak-Network/ai-agent/refs/heads/main/SKILL.md";
|
|
57
68
|
/** Raw SKILL.md fetch timeout (milliseconds) */
|
|
58
69
|
const SKILL_FETCH_TIMEOUT_MS = 10000;
|
|
70
|
+
function readToolsMdStatus() {
|
|
71
|
+
try {
|
|
72
|
+
const exists = fs.existsSync(WORKSPACE_TOOLS_PATH);
|
|
73
|
+
const content = exists ? fs.readFileSync(WORKSPACE_TOOLS_PATH, "utf-8") : "";
|
|
74
|
+
return {
|
|
75
|
+
exists,
|
|
76
|
+
mentionsZcloakAiAgent: content.includes(TOOLS_MD_ZCLOAK_SKILL_MARKER),
|
|
77
|
+
readError: false,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
return {
|
|
82
|
+
exists: false,
|
|
83
|
+
mentionsZcloakAiAgent: false,
|
|
84
|
+
readError: true,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
}
|
|
59
88
|
// ---------------------------------------------------------------------------
|
|
60
89
|
// Local version helper
|
|
61
90
|
// ---------------------------------------------------------------------------
|
|
@@ -249,6 +278,11 @@ async function updateSkill() {
|
|
|
249
278
|
* user to re-run the command (the running binary and SKILL.md are stale).
|
|
250
279
|
*/
|
|
251
280
|
export async function preCheck() {
|
|
281
|
+
const toolsMdStatus = readToolsMdStatus();
|
|
282
|
+
debug("pre-check workspace TOOLS.md", {
|
|
283
|
+
path: WORKSPACE_TOOLS_PATH,
|
|
284
|
+
...toolsMdStatus,
|
|
285
|
+
});
|
|
252
286
|
// --- Gate: skip if last check was recent enough ---
|
|
253
287
|
if (!shouldCheck()) {
|
|
254
288
|
debug("pre-check skipped because interval not reached");
|
|
@@ -299,6 +333,7 @@ export async function preCheck() {
|
|
|
299
333
|
`[zcloak-ai] CLI: ${localVersion ?? "unknown"} → ${remoteVersion} (updated)`,
|
|
300
334
|
`[zcloak-ai] Workspace SKILL.md target: ${WORKSPACE_SKILL_PATH}`,
|
|
301
335
|
`[zcloak-ai] if updated, tell the user version changed. and 1. ${WORKSPACE_SKILL_PATH} maybe not the claw workingspace, you may move the SKILL.md to <claw_workingspace>/skills/zcloak-ai-agent/SKILL.md"; 2. also you must reload the updated SKILL.md and re-run the previous command because of those changes.`,
|
|
336
|
+
...(!toolsMdStatus.mentionsZcloakAiAgent ? [TOOLS_MD_ZCLOAK_SKILL_APPEND_HINT] : []),
|
|
302
337
|
].join("\n"),
|
|
303
338
|
};
|
|
304
339
|
}
|
package/dist/pre-check.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pre-check.js","sourceRoot":"","sources":["../src/pre-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE5E,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;AAE9E,kCAAkC;AAClC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,uDAAuD;AACvD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAEnD,8BAA8B;AAC9B,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;AAEnE,+CAA+C;AAC/C,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;AAElC,gEAAgE;AAChE,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;AAEzC,oDAAoD;AACpD,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CACvC,OAAO,CAAC,GAAG,EAAE,EACb,QAAQ,EACR,iBAAiB,EACjB,UAAU,CACX,CAAC;AAEF,8EAA8E;AAC9E,mBAAmB;AACnB,8EAA8E;AAE9E,2EAA2E;AAC3E,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEzC,sCAAsC;AACtC,MAAM,mBAAmB,GAAG,KAAM,CAAC;AAEnC,yCAAyC;AACzC,MAAM,sBAAsB,GAAG,KAAM,CAAC;AAEtC,2CAA2C;AAC3C,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAE5C,oCAAoC;AACpC,MAAM,YAAY,GAChB,oFAAoF,CAAC;AAEvF,gDAAgD;AAChD,MAAM,sBAAsB,GAAG,KAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"pre-check.js","sourceRoot":"","sources":["../src/pre-check.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc.d.ts
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* encrypt — Encrypt file or inline data using the held AES-256 key
|
|
11
11
|
* decrypt — Decrypt file or inline data using the held AES-256 key
|
|
12
12
|
* ibe-decrypt — Decrypt IBE ciphertext using cached VetKey (Mail daemon mode)
|
|
13
|
-
* status — Query daemon status (
|
|
13
|
+
* status — Query daemon status (active key, principal, uptime)
|
|
14
14
|
* quit — Close current client connection
|
|
15
15
|
* shutdown — Stop the entire daemon gracefully
|
|
16
16
|
*/
|
|
@@ -103,10 +103,12 @@ export interface DecryptResult {
|
|
|
103
103
|
export interface StatusResult {
|
|
104
104
|
/** Daemon status (always "running" while daemon is alive) */
|
|
105
105
|
status: "running";
|
|
106
|
-
/**
|
|
106
|
+
/** Active derivation ID used for encrypt/decrypt requests */
|
|
107
107
|
derivation_id: string;
|
|
108
108
|
/** Authenticated principal text */
|
|
109
109
|
principal: string;
|
|
110
|
+
/** Key names currently loaded in memory */
|
|
111
|
+
loaded_key_names: string[];
|
|
110
112
|
/** Daemon start timestamp (ISO 8601) */
|
|
111
113
|
started_at: string;
|
|
112
114
|
/** Unix socket path */
|
package/dist/rpc.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* encrypt — Encrypt file or inline data using the held AES-256 key
|
|
11
11
|
* decrypt — Decrypt file or inline data using the held AES-256 key
|
|
12
12
|
* ibe-decrypt — Decrypt IBE ciphertext using cached VetKey (Mail daemon mode)
|
|
13
|
-
* status — Query daemon status (
|
|
13
|
+
* status — Query daemon status (active key, principal, uptime)
|
|
14
14
|
* quit — Close current client connection
|
|
15
15
|
* shutdown — Stop the entire daemon gracefully
|
|
16
16
|
*/
|
package/dist/rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../src/rpc.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../src/rpc.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAuHH,+EAA+E;AAC/E,mBAAmB;AACnB,+EAA+E;AAE/E,yCAAyC;AACzC,MAAM,UAAU,eAAe,CAAC,EAA0B,EAAE,MAAe;IACzE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;AACxB,CAAC;AAED,uCAAuC;AACvC,MAAM,UAAU,aAAa,CAAC,EAA0B,EAAE,KAAa;IACrE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;AACvB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,aAAa,CAAC,IAAI,EAAE,iCAAiC,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,IAAI,IAAI,EAAE,0CAA0C,CAAC,CAAC;QACtF,CAAC;QACD,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;SACrB,CAAC;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5F,CAAC;AACH,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,eAAe,CAAC,KAA+B;IAC7D,OAAO,OAAO,IAAI,KAAK,IAAI,OAAQ,KAAqB,CAAC,KAAK,KAAK,QAAQ,CAAC;AAC9E,CAAC"}
|
package/dist/serve.d.ts
CHANGED
|
@@ -21,9 +21,10 @@ import { KeyStore } from './key-store.js';
|
|
|
21
21
|
* 4. Accept connections, handle requests concurrently
|
|
22
22
|
* 5. On shutdown signal: stop accepting, close connections, cleanup
|
|
23
23
|
*
|
|
24
|
-
* @param
|
|
24
|
+
* @param activeKeyStore - AES-256 key holder used for encrypt/decrypt
|
|
25
|
+
* @param mailKeyStore - Optional Mail key holder used for ibe-decrypt
|
|
25
26
|
* @param principal - Authenticated principal text
|
|
26
|
-
* @param
|
|
27
|
+
* @param daemonId - Daemon runtime identifier (one socket/PID pair)
|
|
27
28
|
*/
|
|
28
|
-
export declare function runDaemonUds(
|
|
29
|
+
export declare function runDaemonUds(activeKeyStore: KeyStore, mailKeyStore: KeyStore | null, principal: string, daemonId: string): Promise<void>;
|
|
29
30
|
//# sourceMappingURL=serve.d.ts.map
|
package/dist/serve.js
CHANGED
|
@@ -28,25 +28,29 @@ const MAX_IBE_DATA_SIZE = 64 * 1024 + 256;
|
|
|
28
28
|
* Dispatches to the appropriate handler based on the method name.
|
|
29
29
|
* Returns a response and an action indicating what to do next.
|
|
30
30
|
*/
|
|
31
|
-
function handleRequest(req,
|
|
31
|
+
function handleRequest(req, activeKeyStore, mailKeyStore, principal, startedAt, sockPath) {
|
|
32
32
|
const { id, method } = req;
|
|
33
|
+
const effectiveMailKeyStore = mailKeyStore ?? activeKeyStore;
|
|
34
|
+
const loadedKeyNames = [activeKeyStore, effectiveMailKeyStore]
|
|
35
|
+
.filter((store, index, stores) => store !== null && stores.findIndex(candidate => candidate?.derivationId === store.derivationId) === index)
|
|
36
|
+
.map(store => store.derivationId.split(':').slice(1).join(':') || 'default');
|
|
33
37
|
switch (method) {
|
|
34
38
|
case "encrypt": {
|
|
35
|
-
const result = handleEncrypt(req.params,
|
|
39
|
+
const result = handleEncrypt(req.params, activeKeyStore);
|
|
36
40
|
if ("error" in result) {
|
|
37
41
|
return { response: errorResponse(id, result.error), action: "continue" };
|
|
38
42
|
}
|
|
39
43
|
return { response: successResponse(id, result), action: "continue" };
|
|
40
44
|
}
|
|
41
45
|
case "decrypt": {
|
|
42
|
-
const result = handleDecrypt(req.params,
|
|
46
|
+
const result = handleDecrypt(req.params, activeKeyStore);
|
|
43
47
|
if ("error" in result) {
|
|
44
48
|
return { response: errorResponse(id, result.error), action: "continue" };
|
|
45
49
|
}
|
|
46
50
|
return { response: successResponse(id, result), action: "continue" };
|
|
47
51
|
}
|
|
48
52
|
case "ibe-decrypt": {
|
|
49
|
-
const result = handleIbeDecrypt(req.params,
|
|
53
|
+
const result = handleIbeDecrypt(req.params, effectiveMailKeyStore);
|
|
50
54
|
if ("error" in result) {
|
|
51
55
|
return { response: errorResponse(id, result.error), action: "continue" };
|
|
52
56
|
}
|
|
@@ -55,8 +59,9 @@ function handleRequest(req, keyStore, principal, startedAt, sockPath) {
|
|
|
55
59
|
case "status": {
|
|
56
60
|
const status = {
|
|
57
61
|
status: "running",
|
|
58
|
-
derivation_id:
|
|
62
|
+
derivation_id: activeKeyStore.derivationId,
|
|
59
63
|
principal,
|
|
64
|
+
loaded_key_names: loadedKeyNames,
|
|
60
65
|
started_at: startedAt,
|
|
61
66
|
socket_path: sockPath,
|
|
62
67
|
};
|
|
@@ -323,14 +328,15 @@ function readFileChecked(filePath) {
|
|
|
323
328
|
* 4. Accept connections, handle requests concurrently
|
|
324
329
|
* 5. On shutdown signal: stop accepting, close connections, cleanup
|
|
325
330
|
*
|
|
326
|
-
* @param
|
|
331
|
+
* @param activeKeyStore - AES-256 key holder used for encrypt/decrypt
|
|
332
|
+
* @param mailKeyStore - Optional Mail key holder used for ibe-decrypt
|
|
327
333
|
* @param principal - Authenticated principal text
|
|
328
|
-
* @param
|
|
334
|
+
* @param daemonId - Daemon runtime identifier (one socket/PID pair)
|
|
329
335
|
*/
|
|
330
|
-
export function runDaemonUds(
|
|
336
|
+
export function runDaemonUds(activeKeyStore, mailKeyStore, principal, daemonId) {
|
|
331
337
|
return new Promise((resolve, reject) => {
|
|
332
338
|
// Step 1: Create daemon runtime (PID file, socket setup)
|
|
333
|
-
const runtime = DaemonRuntime.create(
|
|
339
|
+
const runtime = DaemonRuntime.create(daemonId);
|
|
334
340
|
const startedAt = new Date().toISOString();
|
|
335
341
|
const sockPath = runtime.socketFilePath;
|
|
336
342
|
// Track active connections for graceful shutdown
|
|
@@ -354,7 +360,7 @@ export function runDaemonUds(keyStore, principal, derivationId) {
|
|
|
354
360
|
return;
|
|
355
361
|
}
|
|
356
362
|
// Handle the request
|
|
357
|
-
const { response, action } = handleRequest(parsed,
|
|
363
|
+
const { response, action } = handleRequest(parsed, activeKeyStore, mailKeyStore, principal, startedAt, sockPath);
|
|
358
364
|
writeLine(conn, JSON.stringify(response));
|
|
359
365
|
if (action === "quit") {
|
|
360
366
|
// Close this connection only
|
|
@@ -377,7 +383,10 @@ export function runDaemonUds(keyStore, principal, derivationId) {
|
|
|
377
383
|
server.listen(sockPath, () => {
|
|
378
384
|
// Emit ready info to stderr
|
|
379
385
|
log.info(`Daemon ready. Socket: ${sockPath}`);
|
|
380
|
-
log.info(`
|
|
386
|
+
log.info(`Active derivation ID: ${activeKeyStore.derivationId}`);
|
|
387
|
+
if (mailKeyStore && mailKeyStore.derivationId !== activeKeyStore.derivationId) {
|
|
388
|
+
log.info(`Mail derivation ID: ${mailKeyStore.derivationId}`);
|
|
389
|
+
}
|
|
381
390
|
log.info(`Principal: ${principal}`);
|
|
382
391
|
});
|
|
383
392
|
server.on("error", (err) => {
|
|
@@ -445,7 +454,11 @@ export function runDaemonUds(keyStore, principal, derivationId) {
|
|
|
445
454
|
process.removeListener("uncaughtException", onUncaughtException);
|
|
446
455
|
process.removeListener("unhandledRejection", onUnhandledRejection);
|
|
447
456
|
// Cleanup: destroy key, remove files
|
|
448
|
-
|
|
457
|
+
const uniqueKeyStores = [activeKeyStore, mailKeyStore]
|
|
458
|
+
.filter((store, index, stores) => store !== null && stores.findIndex(candidate => candidate?.derivationId === store.derivationId) === index);
|
|
459
|
+
for (const store of uniqueKeyStores) {
|
|
460
|
+
store.destroy();
|
|
461
|
+
}
|
|
449
462
|
runtime.destroy();
|
|
450
463
|
log.info("Daemon stopped. Key has been zeroized.");
|
|
451
464
|
resolve();
|