@sumicom/quicksave 0.5.2 → 0.6.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/ai/asyncQueue.d.ts +17 -0
- package/dist/ai/asyncQueue.d.ts.map +1 -0
- package/dist/ai/asyncQueue.js +49 -0
- package/dist/ai/asyncQueue.js.map +1 -0
- package/dist/ai/asyncQueue.test.d.ts +2 -0
- package/dist/ai/asyncQueue.test.d.ts.map +1 -0
- package/dist/ai/asyncQueue.test.js +56 -0
- package/dist/ai/asyncQueue.test.js.map +1 -0
- package/dist/ai/cardBuilder.d.ts +73 -0
- package/dist/ai/cardBuilder.d.ts.map +1 -0
- package/dist/ai/cardBuilder.js +595 -0
- package/dist/ai/cardBuilder.js.map +1 -0
- package/dist/ai/claudeCliProvider.d.ts +19 -0
- package/dist/ai/claudeCliProvider.d.ts.map +1 -0
- package/dist/ai/claudeCliProvider.js +466 -0
- package/dist/ai/claudeCliProvider.js.map +1 -0
- package/dist/ai/claudeSdkProvider.d.ts +18 -0
- package/dist/ai/claudeSdkProvider.d.ts.map +1 -0
- package/dist/ai/claudeSdkProvider.js +418 -0
- package/dist/ai/claudeSdkProvider.js.map +1 -0
- package/dist/ai/commitSummary.d.ts +4 -0
- package/dist/ai/commitSummary.d.ts.map +1 -1
- package/dist/ai/commitSummary.js +80 -40
- package/dist/ai/commitSummary.js.map +1 -1
- package/dist/ai/provider.d.ts +54 -0
- package/dist/ai/provider.d.ts.map +1 -0
- package/dist/ai/provider.js +2 -0
- package/dist/ai/provider.js.map +1 -0
- package/dist/ai/sandboxMcp.d.ts +12 -0
- package/dist/ai/sandboxMcp.d.ts.map +1 -0
- package/dist/ai/sandboxMcp.js +12 -0
- package/dist/ai/sandboxMcp.js.map +1 -0
- package/dist/ai/sandboxMcpStdio.d.ts +16 -0
- package/dist/ai/sandboxMcpStdio.d.ts.map +1 -0
- package/dist/ai/sandboxMcpStdio.js +127 -0
- package/dist/ai/sandboxMcpStdio.js.map +1 -0
- package/dist/ai/sessionManager.d.ts +100 -0
- package/dist/ai/sessionManager.d.ts.map +1 -0
- package/dist/ai/sessionManager.js +595 -0
- package/dist/ai/sessionManager.js.map +1 -0
- package/dist/ai/sessionRegistry.d.ts +28 -0
- package/dist/ai/sessionRegistry.d.ts.map +1 -0
- package/dist/ai/sessionRegistry.js +148 -0
- package/dist/ai/sessionRegistry.js.map +1 -0
- package/dist/connection/connection.d.ts +24 -6
- package/dist/connection/connection.d.ts.map +1 -1
- package/dist/connection/connection.js +85 -13
- package/dist/connection/connection.js.map +1 -1
- package/dist/connection/pubsub.d.ts +41 -0
- package/dist/connection/pubsub.d.ts.map +1 -0
- package/dist/connection/pubsub.js +101 -0
- package/dist/connection/pubsub.js.map +1 -0
- package/dist/connection/pubsub.test.d.ts +2 -0
- package/dist/connection/pubsub.test.d.ts.map +1 -0
- package/dist/connection/pubsub.test.js +96 -0
- package/dist/connection/pubsub.test.js.map +1 -0
- package/dist/git/operations.d.ts +6 -1
- package/dist/git/operations.d.ts.map +1 -1
- package/dist/git/operations.js +31 -2
- package/dist/git/operations.js.map +1 -1
- package/dist/handlers/messageHandler.d.ts +25 -5
- package/dist/handlers/messageHandler.d.ts.map +1 -1
- package/dist/handlers/messageHandler.js +266 -29
- package/dist/handlers/messageHandler.js.map +1 -1
- package/dist/handlers/messageHandler.test.js +1 -1
- package/dist/index.js +192 -41
- package/dist/index.js.map +1 -1
- package/dist/service/ensureDaemon.d.ts.map +1 -1
- package/dist/service/ensureDaemon.js +15 -2
- package/dist/service/ensureDaemon.js.map +1 -1
- package/dist/service/ipc.test.js +6 -6
- package/dist/service/ipcClient.js +1 -1
- package/dist/service/run.d.ts.map +1 -1
- package/dist/service/run.js +120 -11
- package/dist/service/run.js.map +1 -1
- package/dist/service/singleton.d.ts +4 -0
- package/dist/service/singleton.d.ts.map +1 -1
- package/dist/service/singleton.js +28 -2
- package/dist/service/singleton.js.map +1 -1
- package/dist/service/singleton.test.js +1 -1
- package/dist/service/types.d.ts +29 -0
- package/dist/service/types.d.ts.map +1 -1
- package/dist/service/types.js +11 -0
- package/dist/service/types.js.map +1 -1
- package/package.json +5 -3
- package/dist/ai/claudeCodeService.d.ts +0 -111
- package/dist/ai/claudeCodeService.d.ts.map +0 -1
- package/dist/ai/claudeCodeService.js +0 -764
- package/dist/ai/claudeCodeService.js.map +0 -1
package/dist/index.js
CHANGED
|
@@ -10,6 +10,7 @@ import { runDaemon } from './service/run.js';
|
|
|
10
10
|
import { IpcClient as IpcClientClass } from './service/ipcClient.js';
|
|
11
11
|
import { readServiceState } from './service/stateStore.js';
|
|
12
12
|
import { isProcessAlive } from './service/singleton.js';
|
|
13
|
+
import { isDebugEnabled } from './service/types.js';
|
|
13
14
|
const program = new Command();
|
|
14
15
|
function collectValues(value, previous) {
|
|
15
16
|
return previous.concat([value]);
|
|
@@ -17,7 +18,7 @@ function collectValues(value, previous) {
|
|
|
17
18
|
program
|
|
18
19
|
.name('quicksave-agent')
|
|
19
20
|
.description('Quicksave desktop agent for remote git control')
|
|
20
|
-
.version('0.
|
|
21
|
+
.version('0.6.1')
|
|
21
22
|
.allowExcessArguments(false)
|
|
22
23
|
.option('-r, --repo <path>', 'Path to git repository (can specify multiple)', collectValues, [])
|
|
23
24
|
.option('-c, --coding-path <path>', 'Path for Claude Code sessions (can specify multiple, non-git dirs OK)', collectValues, [])
|
|
@@ -49,7 +50,7 @@ program
|
|
|
49
50
|
try {
|
|
50
51
|
const result = await ensureDaemon();
|
|
51
52
|
client = result.client;
|
|
52
|
-
console.log(`Quicksave Agent v0.
|
|
53
|
+
console.log(`Quicksave Agent v0.6.1 (daemon pid: ${result.hello.daemonPid})`);
|
|
53
54
|
console.log('='.repeat(50));
|
|
54
55
|
}
|
|
55
56
|
catch (err) {
|
|
@@ -73,44 +74,7 @@ program
|
|
|
73
74
|
catch (err) {
|
|
74
75
|
console.error('Failed to get pairing info:', err.message);
|
|
75
76
|
}
|
|
76
|
-
|
|
77
|
-
await client.request('subscribe-events');
|
|
78
|
-
client.onNotification((method, params) => {
|
|
79
|
-
if (method === 'event.peerConnected') {
|
|
80
|
-
const p = params;
|
|
81
|
-
console.log(`\n+ PWA connected: ${p.peerId}... (${p.peerCount} peer${p.peerCount !== 1 ? 's' : ''})`);
|
|
82
|
-
}
|
|
83
|
-
else if (method === 'event.peerDisconnected') {
|
|
84
|
-
const p = params;
|
|
85
|
-
console.log(`\n- PWA disconnected: ${p.peerId}... (${p.peerCount} peer${p.peerCount !== 1 ? 's' : ''})`);
|
|
86
|
-
}
|
|
87
|
-
else if (method === 'event.repoAdded') {
|
|
88
|
-
const p = params;
|
|
89
|
-
console.log(`\n+ Repo added: ${p.repo.name} (${p.repo.path})`);
|
|
90
|
-
}
|
|
91
|
-
else if (method === 'event.repoRemoved') {
|
|
92
|
-
const p = params;
|
|
93
|
-
console.log(`\n- Repo removed: ${p.path}`);
|
|
94
|
-
}
|
|
95
|
-
else if (method === 'event.daemonStatus') {
|
|
96
|
-
// Daemon status change (e.g., shutting down)
|
|
97
|
-
if (params.shutting_down) {
|
|
98
|
-
console.log('\nDaemon is shutting down...');
|
|
99
|
-
client.close();
|
|
100
|
-
process.exit(0);
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
// Ctrl+C detaches (leaves daemon running)
|
|
105
|
-
process.on('SIGINT', () => {
|
|
106
|
-
console.log('\nDetaching (daemon still running)...');
|
|
107
|
-
client.close();
|
|
108
|
-
process.exit(0);
|
|
109
|
-
});
|
|
110
|
-
process.on('SIGTERM', () => {
|
|
111
|
-
client.close();
|
|
112
|
-
process.exit(0);
|
|
113
|
-
});
|
|
77
|
+
client.close();
|
|
114
78
|
});
|
|
115
79
|
function displayPairingInfo(info, showQr) {
|
|
116
80
|
console.log('Agent ID:');
|
|
@@ -177,7 +141,8 @@ serviceCmd
|
|
|
177
141
|
}
|
|
178
142
|
const { ensureDaemon } = await import('./service/ensureDaemon.js');
|
|
179
143
|
try {
|
|
180
|
-
const { hello } = await ensureDaemon();
|
|
144
|
+
const { client, hello } = await ensureDaemon();
|
|
145
|
+
client.close();
|
|
181
146
|
console.log(`Daemon started (pid: ${hello.daemonPid})`);
|
|
182
147
|
}
|
|
183
148
|
catch (err) {
|
|
@@ -271,6 +236,192 @@ serviceCmd
|
|
|
271
236
|
console.log(`Connection: ${state.connectionState}`);
|
|
272
237
|
console.log(`Peers: ${state.peerCount}`);
|
|
273
238
|
});
|
|
239
|
+
// ---------------------------------------------------------------------------
|
|
240
|
+
// Helper: connect to running daemon, run callback, close
|
|
241
|
+
// ---------------------------------------------------------------------------
|
|
242
|
+
async function withDaemon(fn) {
|
|
243
|
+
const state = readServiceState();
|
|
244
|
+
if (!state) {
|
|
245
|
+
console.error('No daemon is running.');
|
|
246
|
+
process.exit(1);
|
|
247
|
+
}
|
|
248
|
+
if (!isProcessAlive(state.pid)) {
|
|
249
|
+
console.error('Daemon process is dead.');
|
|
250
|
+
process.exit(1);
|
|
251
|
+
}
|
|
252
|
+
const client = new IpcClientClass();
|
|
253
|
+
await client.connect(state.socketPath);
|
|
254
|
+
try {
|
|
255
|
+
return await fn(client);
|
|
256
|
+
}
|
|
257
|
+
finally {
|
|
258
|
+
client.close();
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
// ---------------------------------------------------------------------------
|
|
262
|
+
// Debug commands — disabled in production unless QUICKSAVE_DEBUG=1
|
|
263
|
+
// ---------------------------------------------------------------------------
|
|
264
|
+
if (isDebugEnabled()) {
|
|
265
|
+
serviceCmd
|
|
266
|
+
.command('debug')
|
|
267
|
+
.description('Show daemon internal state (peers, subscriptions, pending permissions, sessions)')
|
|
268
|
+
.action(async () => {
|
|
269
|
+
try {
|
|
270
|
+
await withDaemon(async (client) => {
|
|
271
|
+
const d = await client.request('debug');
|
|
272
|
+
console.log(`Quicksave Debug (pid: ${d.pid}, uptime: ${formatUptime(Math.floor(d.uptime))})\n`);
|
|
273
|
+
console.log(`Peers (${d.peers.length}):`);
|
|
274
|
+
if (d.peers.length === 0)
|
|
275
|
+
console.log(' (none)');
|
|
276
|
+
for (const p of d.peers) {
|
|
277
|
+
const ago = Math.floor((Date.now() - p.connectedAt) / 1000);
|
|
278
|
+
console.log(` ${p.address} connected ${formatUptime(ago)} ago topics: [${p.topics.join(', ')}]`);
|
|
279
|
+
}
|
|
280
|
+
console.log(`\nSubscriptions:`);
|
|
281
|
+
const subs = Object.entries(d.subscriptions);
|
|
282
|
+
if (subs.length === 0)
|
|
283
|
+
console.log(' (none)');
|
|
284
|
+
for (const [topic, addrs] of subs) {
|
|
285
|
+
console.log(` ${topic.padEnd(28)} → ${addrs.length} peer${addrs.length !== 1 ? 's' : ''}`);
|
|
286
|
+
}
|
|
287
|
+
console.log(`\nPending Inputs (${d.pendingInputs.length}):`);
|
|
288
|
+
if (d.pendingInputs.length === 0)
|
|
289
|
+
console.log(' (none)');
|
|
290
|
+
for (const p of d.pendingInputs) {
|
|
291
|
+
console.log(` ${p.requestId} session=${p.sessionId.slice(0, 8)} tool=${p.toolName ?? 'unknown'} agentId=${p.agentId ?? 'none'} type=${p.inputType}`);
|
|
292
|
+
}
|
|
293
|
+
console.log(`\nActive Sessions (${d.activeSessions.length}):`);
|
|
294
|
+
if (d.activeSessions.length === 0)
|
|
295
|
+
console.log(' (none)');
|
|
296
|
+
for (const s of d.activeSessions) {
|
|
297
|
+
console.log(` ${s.sessionId.slice(0, 8)} cwd=${s.cwd} streaming=${s.isStreaming} pending=${s.hasPendingInput} mode=${s.permissionMode}`);
|
|
298
|
+
}
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
catch (err) {
|
|
302
|
+
console.error('Failed to query daemon:', err.message);
|
|
303
|
+
process.exit(1);
|
|
304
|
+
}
|
|
305
|
+
});
|
|
306
|
+
serviceCmd
|
|
307
|
+
.command('sessions')
|
|
308
|
+
.description('List all sessions (SDK + live state)')
|
|
309
|
+
.option('--cwd <path>', 'Working directory for session lookup')
|
|
310
|
+
.action(async (opts) => {
|
|
311
|
+
try {
|
|
312
|
+
await withDaemon(async (client) => {
|
|
313
|
+
const params = {};
|
|
314
|
+
if (opts.cwd)
|
|
315
|
+
params.cwd = resolve(opts.cwd);
|
|
316
|
+
const { sessions } = await client.request('list-sessions', params);
|
|
317
|
+
console.log(`Sessions (${sessions.length}):`);
|
|
318
|
+
if (sessions.length === 0) {
|
|
319
|
+
console.log(' (none)');
|
|
320
|
+
return;
|
|
321
|
+
}
|
|
322
|
+
for (const s of sessions) {
|
|
323
|
+
const id = s.sessionId.slice(0, 8);
|
|
324
|
+
const active = s.isActive ? 'active' : 'idle';
|
|
325
|
+
const streaming = s.isStreaming ? ' streaming' : '';
|
|
326
|
+
const pending = s.hasPendingInput ? ' pending' : '';
|
|
327
|
+
const mode = s.permissionMode ? ` mode=${s.permissionMode}` : '';
|
|
328
|
+
const prompt = s.prompt ? ` "${s.prompt.slice(0, 40)}${s.prompt.length > 40 ? '...' : ''}"` : '';
|
|
329
|
+
console.log(` ${id} ${active}${streaming}${pending}${mode}${prompt}`);
|
|
330
|
+
}
|
|
331
|
+
});
|
|
332
|
+
}
|
|
333
|
+
catch (err) {
|
|
334
|
+
console.error('Failed to query daemon:', err.message);
|
|
335
|
+
process.exit(1);
|
|
336
|
+
}
|
|
337
|
+
});
|
|
338
|
+
serviceCmd
|
|
339
|
+
.command('cards <sessionId>')
|
|
340
|
+
.description('Show card history for a session')
|
|
341
|
+
.option('--cwd <path>', 'Working directory')
|
|
342
|
+
.option('--limit <n>', 'Max cards to show', '30')
|
|
343
|
+
.action(async (sessionId, opts) => {
|
|
344
|
+
try {
|
|
345
|
+
await withDaemon(async (client) => {
|
|
346
|
+
const params = { sessionId, limit: parseInt(opts.limit) };
|
|
347
|
+
if (opts.cwd)
|
|
348
|
+
params.cwd = resolve(opts.cwd);
|
|
349
|
+
const result = await client.request('get-cards', params);
|
|
350
|
+
const pendingCount = result.pendingInputs?.length ?? 0;
|
|
351
|
+
console.log(`Cards for session ${sessionId.slice(0, 8)} (${result.total} total, ${pendingCount} pending):\n`);
|
|
352
|
+
for (let i = 0; i < result.cards.length; i++) {
|
|
353
|
+
const c = result.cards[i];
|
|
354
|
+
const num = `#${i + 1}`.padEnd(4);
|
|
355
|
+
const type = c.type.padEnd(16);
|
|
356
|
+
let detail = '';
|
|
357
|
+
switch (c.type) {
|
|
358
|
+
case 'user':
|
|
359
|
+
detail = `"${c.text?.slice(0, 60) ?? ''}"`;
|
|
360
|
+
break;
|
|
361
|
+
case 'assistant_text':
|
|
362
|
+
detail = `"${c.text?.slice(0, 60) ?? ''}"`;
|
|
363
|
+
break;
|
|
364
|
+
case 'tool_call': {
|
|
365
|
+
const tc = c;
|
|
366
|
+
detail = tc.toolName ?? '';
|
|
367
|
+
if (tc.result)
|
|
368
|
+
detail += ` result=${JSON.stringify(tc.result).slice(0, 40)}`;
|
|
369
|
+
if (c.pendingInput)
|
|
370
|
+
detail += ` ⏳ ${c.pendingInput.requestId}`;
|
|
371
|
+
break;
|
|
372
|
+
}
|
|
373
|
+
case 'subagent': {
|
|
374
|
+
const sa = c;
|
|
375
|
+
detail = `agentId=${sa.agentId?.slice(0, 12) ?? '?'} status=${sa.status} tools=${sa.toolUseCount ?? 0}`;
|
|
376
|
+
if (c.pendingInput)
|
|
377
|
+
detail += ` ⏳ ${c.pendingInput.requestId}`;
|
|
378
|
+
break;
|
|
379
|
+
}
|
|
380
|
+
case 'thinking':
|
|
381
|
+
detail = `"${c.text?.slice(0, 60) ?? ''}"`;
|
|
382
|
+
break;
|
|
383
|
+
case 'system':
|
|
384
|
+
detail = `[${c.subtype ?? 'info'}] "${c.text?.slice(0, 50) ?? ''}"`;
|
|
385
|
+
break;
|
|
386
|
+
}
|
|
387
|
+
console.log(` ${num}${type}${detail}`);
|
|
388
|
+
}
|
|
389
|
+
if (result.pendingInputs && result.pendingInputs.length > 0) {
|
|
390
|
+
console.log(`\nPending Inputs:`);
|
|
391
|
+
for (const p of result.pendingInputs) {
|
|
392
|
+
console.log(` ${p.requestId} tool=${p.toolName ?? 'unknown'} agentId=${p.agentId ?? 'none'} type=${p.inputType}`);
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
});
|
|
396
|
+
}
|
|
397
|
+
catch (err) {
|
|
398
|
+
console.error('Failed to query daemon:', err.message);
|
|
399
|
+
process.exit(1);
|
|
400
|
+
}
|
|
401
|
+
});
|
|
402
|
+
serviceCmd
|
|
403
|
+
.command('resolve <requestId>')
|
|
404
|
+
.description('Force-resolve a stuck permission request')
|
|
405
|
+
.option('--deny', 'Deny instead of allow')
|
|
406
|
+
.action(async (requestId, opts) => {
|
|
407
|
+
try {
|
|
408
|
+
await withDaemon(async (client) => {
|
|
409
|
+
const action = opts.deny ? 'deny' : 'allow';
|
|
410
|
+
const { resolved } = await client.request('resolve-input', { requestId, action });
|
|
411
|
+
if (resolved) {
|
|
412
|
+
console.log(`Resolved ${requestId} (action: ${action})`);
|
|
413
|
+
}
|
|
414
|
+
else {
|
|
415
|
+
console.log(`Request ${requestId} not found in pending queue.`);
|
|
416
|
+
}
|
|
417
|
+
});
|
|
418
|
+
}
|
|
419
|
+
catch (err) {
|
|
420
|
+
console.error('Failed:', err.message);
|
|
421
|
+
process.exit(1);
|
|
422
|
+
}
|
|
423
|
+
});
|
|
424
|
+
} // end isDebugEnabled()
|
|
274
425
|
function formatUptime(seconds) {
|
|
275
426
|
const h = Math.floor(seconds / 3600);
|
|
276
427
|
const m = Math.floor((seconds % 3600) / 60);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureDaemon.d.ts","sourceRoot":"","sources":["../../src/service/ensureDaemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ensureDaemon.d.ts","sourceRoot":"","sources":["../../src/service/ensureDaemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAQ9C,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,WAAW,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAoDhE"}
|
|
@@ -21,6 +21,7 @@ const MAX_ATTACH_RETRIES = 3;
|
|
|
21
21
|
const BASE_RETRY_DELAY_MS = 500;
|
|
22
22
|
const DAEMON_READY_TIMEOUT_MS = 10_000;
|
|
23
23
|
const DAEMON_READY_POLL_MS = 200;
|
|
24
|
+
const MAX_SPAWN_ATTEMPTS = 2;
|
|
24
25
|
/**
|
|
25
26
|
* Ensure the daemon is running and return a connected IPC client.
|
|
26
27
|
* Auto-starts a new daemon if needed.
|
|
@@ -75,10 +76,22 @@ export async function ensureDaemon() {
|
|
|
75
76
|
}
|
|
76
77
|
/**
|
|
77
78
|
* Spawn a new daemon process in detached mode and wait for it to be ready.
|
|
79
|
+
* Retries once if the first attempt times out (cleans stale files between attempts).
|
|
78
80
|
*/
|
|
79
81
|
async function startAndConnect() {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
+
for (let attempt = 1; attempt <= MAX_SPAWN_ATTEMPTS; attempt++) {
|
|
83
|
+
spawnDaemon();
|
|
84
|
+
try {
|
|
85
|
+
return await waitForDaemon();
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
cleanStaleRuntime();
|
|
89
|
+
if (attempt < MAX_SPAWN_ATTEMPTS) {
|
|
90
|
+
console.warn(`Daemon startup timed out, retrying (${attempt}/${MAX_SPAWN_ATTEMPTS})...`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
throw new Error('Timed out waiting for daemon to start');
|
|
82
95
|
}
|
|
83
96
|
/**
|
|
84
97
|
* Spawn `quicksave service run` as a detached background process.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureDaemon.js","sourceRoot":"","sources":["../../src/service/ensureDaemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGxE,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,uBAAuB,GAAG,MAAM,CAAC;AACvC,MAAM,oBAAoB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"ensureDaemon.js","sourceRoot":"","sources":["../../src/service/ensureDaemon.ts"],"names":[],"mappings":"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"}
|
package/dist/service/ipc.test.js
CHANGED
|
@@ -30,7 +30,7 @@ describe('IPC Server + Client', () => {
|
|
|
30
30
|
}
|
|
31
31
|
async function createServer() {
|
|
32
32
|
const sock = socketPath();
|
|
33
|
-
server = new IpcServer({ version: '0.
|
|
33
|
+
server = new IpcServer({ version: '0.6.1' });
|
|
34
34
|
await server.listen(sock);
|
|
35
35
|
return sock;
|
|
36
36
|
}
|
|
@@ -43,7 +43,7 @@ describe('IPC Server + Client', () => {
|
|
|
43
43
|
it('hello handshake returns daemon version info', async () => {
|
|
44
44
|
const sock = await createServer();
|
|
45
45
|
const { hello } = await createClient(sock);
|
|
46
|
-
expect(hello.daemonVersion).toBe('0.
|
|
46
|
+
expect(hello.daemonVersion).toBe('0.6.1');
|
|
47
47
|
expect(hello.daemonIpcVersion).toBe(1);
|
|
48
48
|
expect(hello.daemonPid).toBe(process.pid);
|
|
49
49
|
expect(typeof hello.daemonBuildId).toBe('string');
|
|
@@ -52,7 +52,7 @@ describe('IPC Server + Client', () => {
|
|
|
52
52
|
const sock = await createServer();
|
|
53
53
|
const { client } = await createClient(sock);
|
|
54
54
|
const result = await client.request('ping');
|
|
55
|
-
expect(result.version).toBe('0.
|
|
55
|
+
expect(result.version).toBe('0.6.1');
|
|
56
56
|
expect(result.ipcVersion).toBe(1);
|
|
57
57
|
expect(typeof result.uptime).toBe('number');
|
|
58
58
|
expect(result.uptime).toBeGreaterThanOrEqual(0);
|
|
@@ -62,7 +62,7 @@ describe('IPC Server + Client', () => {
|
|
|
62
62
|
const { client } = await createClient(sock);
|
|
63
63
|
const result = await client.request('status');
|
|
64
64
|
expect(result.pid).toBe(process.pid);
|
|
65
|
-
expect(result.version).toBe('0.
|
|
65
|
+
expect(result.version).toBe('0.6.1');
|
|
66
66
|
expect(typeof result.uptime).toBe('number');
|
|
67
67
|
expect(result.connectionState).toBe('disconnected');
|
|
68
68
|
expect(result.peerCount).toBe(0);
|
|
@@ -85,8 +85,8 @@ describe('IPC Server + Client', () => {
|
|
|
85
85
|
const { client: c2 } = await createClient(sock);
|
|
86
86
|
const r1 = await c1.request('ping');
|
|
87
87
|
const r2 = await c2.request('ping');
|
|
88
|
-
expect(r1.version).toBe('0.
|
|
89
|
-
expect(r2.version).toBe('0.
|
|
88
|
+
expect(r1.version).toBe('0.6.1');
|
|
89
|
+
expect(r2.version).toBe('0.6.1');
|
|
90
90
|
expect(server.getClientCount()).toBe(2);
|
|
91
91
|
});
|
|
92
92
|
it('subscribe-events enables notifications', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/service/run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/service/run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AA4BH,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CA2Q/C"}
|
package/dist/service/run.js
CHANGED
|
@@ -9,19 +9,22 @@
|
|
|
9
9
|
* 5. Persist ready state to service.json.
|
|
10
10
|
* 6. Run heartbeat loop.
|
|
11
11
|
*/
|
|
12
|
-
import { basename } from 'path';
|
|
12
|
+
import { basename, join, resolve, dirname } from 'path';
|
|
13
13
|
import { hostname } from 'os';
|
|
14
|
+
import { fileURLToPath } from 'url';
|
|
15
|
+
import { spawn } from 'child_process';
|
|
14
16
|
import { getOrCreateConfig, getManagedRepos, getManagedCodingPaths, addManagedRepo, removeManagedRepo } from '../config.js';
|
|
15
17
|
import { AgentConnection } from '../connection/connection.js';
|
|
16
18
|
import { MessageHandler } from '../handlers/messageHandler.js';
|
|
17
19
|
import { GitOperations } from '../git/operations.js';
|
|
18
20
|
import { IpcServer } from './ipcServer.js';
|
|
19
|
-
import { acquireLock, ensureDirectories, getSocketPath, cleanStaleRuntime, } from './singleton.js';
|
|
21
|
+
import { acquireLock, ensureDirectories, getSocketPath, getRunDir, cleanStaleRuntime, } from './singleton.js';
|
|
20
22
|
import { writeServiceState, removeServiceState } from './stateStore.js';
|
|
21
|
-
import { IPC_VERSION, BUILD_ID } from './types.js';
|
|
23
|
+
import { IPC_VERSION, BUILD_ID, isDebugEnabled } from './types.js';
|
|
22
24
|
import { createMessage } from '@sumicom/quicksave-shared';
|
|
25
|
+
import { getSessionRegistry } from '../ai/sessionRegistry.js';
|
|
23
26
|
const HEARTBEAT_INTERVAL_MS = 30_000;
|
|
24
|
-
const PACKAGE_VERSION = '0.
|
|
27
|
+
const PACKAGE_VERSION = '0.6.1';
|
|
25
28
|
export async function runDaemon() {
|
|
26
29
|
ensureDirectories();
|
|
27
30
|
// Prevent unhandled rejections from silently killing the daemon
|
|
@@ -59,14 +62,61 @@ export async function runDaemon() {
|
|
|
59
62
|
agentId: config.agentId,
|
|
60
63
|
keyPair: config.keyPair,
|
|
61
64
|
});
|
|
62
|
-
const
|
|
63
|
-
|
|
65
|
+
const isProduction = !BUILD_ID.startsWith('dev-');
|
|
66
|
+
const messageHandler = new MessageHandler(validRepos, config.license, codingPaths, isProduction);
|
|
67
|
+
// Self-restart after update: spawn a detached launcher that
|
|
68
|
+
// 1. sanity-checks the new binary (--version)
|
|
69
|
+
// 2. only then kills the old daemon
|
|
70
|
+
// 3. starts the new daemon
|
|
71
|
+
// If the sanity check fails, old daemon stays alive untouched.
|
|
72
|
+
messageHandler.onRestartRequested = () => {
|
|
73
|
+
console.log('Update complete — spawning upgrade launcher...');
|
|
74
|
+
const thisFile = fileURLToPath(import.meta.url);
|
|
75
|
+
const isTs = thisFile.endsWith('.ts');
|
|
76
|
+
const entryPath = resolve(dirname(thisFile), isTs ? '../index.ts' : '../index.js');
|
|
77
|
+
const logPath = join(getRunDir(), 'daemon.log');
|
|
78
|
+
const node = process.execPath;
|
|
79
|
+
const nf = isTs ? `--import tsx ` : '';
|
|
80
|
+
const oldPid = process.pid;
|
|
81
|
+
// Escape single quotes in paths for safe shell interpolation
|
|
82
|
+
const sq = (s) => `'${s.replace(/'/g, "'\\''")}'`;
|
|
83
|
+
// Detached shell: verify → kill old → start new
|
|
84
|
+
const script = [
|
|
85
|
+
`sleep 1`,
|
|
86
|
+
// Sanity-check: if new binary can't even print version, abort
|
|
87
|
+
`${sq(node)} ${nf}${sq(entryPath)} --version > /dev/null 2>&1`,
|
|
88
|
+
`|| { echo "[upgrade] new binary failed sanity check, aborting" >> ${sq(logPath)}; exit 1; }`,
|
|
89
|
+
// New binary works — kill old daemon (graceful shutdown releases lock)
|
|
90
|
+
`kill ${oldPid}`,
|
|
91
|
+
// Wait for old daemon to fully exit and release lock
|
|
92
|
+
`for i in 1 2 3 4 5; do kill -0 ${oldPid} 2>/dev/null || break; sleep 1; done`,
|
|
93
|
+
// Start new daemon
|
|
94
|
+
`${sq(node)} ${nf}${sq(entryPath)} service run >> ${sq(logPath)} 2>&1`,
|
|
95
|
+
].join(' && ');
|
|
96
|
+
spawn('sh', ['-c', script], {
|
|
97
|
+
detached: true, stdio: 'ignore', env: process.env,
|
|
98
|
+
}).unref();
|
|
99
|
+
};
|
|
100
|
+
// Pub/sub: ClaudeCodeService emits card events → send only to peers subscribed to that session
|
|
64
101
|
const claudeService = messageHandler.getClaudeService();
|
|
65
|
-
claudeService.on('
|
|
66
|
-
connection.sendToSession(event.sessionId, createMessage('claude:
|
|
102
|
+
claudeService.on('card-event', (event) => {
|
|
103
|
+
connection.sendToSession(event.sessionId, createMessage('claude:card-event', event));
|
|
67
104
|
});
|
|
68
|
-
claudeService.on('stream
|
|
69
|
-
connection.sendToSession(result.sessionId, createMessage('claude:stream
|
|
105
|
+
claudeService.on('card-stream-end', (result) => {
|
|
106
|
+
connection.sendToSession(result.sessionId, createMessage('claude:card-stream-end', result));
|
|
107
|
+
// Update session registry with cost/message count
|
|
108
|
+
const cwd = claudeService.getSessionCwd(result.sessionId);
|
|
109
|
+
if (cwd) {
|
|
110
|
+
const registry = getSessionRegistry();
|
|
111
|
+
const entry = registry.getEntry(cwd, result.sessionId);
|
|
112
|
+
if (entry) {
|
|
113
|
+
registry.updateEntry(cwd, result.sessionId, {
|
|
114
|
+
messageCount: (entry.messageCount ?? 0) + 1,
|
|
115
|
+
totalCostUsd: (entry.totalCostUsd ?? 0) + (result.totalCostUsd ?? 0),
|
|
116
|
+
lastAccessedAt: Date.now(),
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
}
|
|
70
120
|
});
|
|
71
121
|
claudeService.on('user-input-request', (request) => {
|
|
72
122
|
connection.sendToSession(request.sessionId, createMessage('claude:user-input-request', request));
|
|
@@ -81,12 +131,26 @@ export async function runDaemon() {
|
|
|
81
131
|
claudeService.on('preferences-updated', (prefs) => {
|
|
82
132
|
connection.broadcast(createMessage('claude:preferences-updated', prefs));
|
|
83
133
|
});
|
|
134
|
+
claudeService.on('session-config-updated', (payload) => {
|
|
135
|
+
connection.broadcast(createMessage('session:config-updated', payload));
|
|
136
|
+
});
|
|
84
137
|
// Init preferences from the last session's JSONL (best-effort, non-blocking)
|
|
85
138
|
claudeService.initPreferences().catch(() => { });
|
|
86
|
-
//
|
|
139
|
+
// Init session registry (loads all entries from disk)
|
|
140
|
+
getSessionRegistry();
|
|
141
|
+
// Track which session each peer is viewing.
|
|
142
|
+
// Permission state is now carried directly on cards (via CardBuilder),
|
|
143
|
+
// so getCards() returns cards with pendingInput already attached.
|
|
144
|
+
// No need to re-send user-input-request on subscribe.
|
|
87
145
|
messageHandler.onPeerSubscribed = (peerAddress, sessionId) => {
|
|
88
146
|
connection.subscribePeerToSession(peerAddress, sessionId);
|
|
89
147
|
};
|
|
148
|
+
messageHandler.onPeerUnsubscribed = (peerAddress, sessionId) => {
|
|
149
|
+
connection.unsubscribePeerFromSession(peerAddress, sessionId);
|
|
150
|
+
};
|
|
151
|
+
messageHandler.onHistoryUpdated = (cwd, entry, action) => {
|
|
152
|
+
connection.broadcast(createMessage('session:history-updated', { cwd, entry, action }));
|
|
153
|
+
};
|
|
90
154
|
// Wire: incoming PWA messages → MessageHandler → response back to PWA
|
|
91
155
|
connection.on('message', async (message, peerAddress) => {
|
|
92
156
|
try {
|
|
@@ -275,6 +339,51 @@ function registerDaemonMethods(ipcServer, connection, messageHandler, config) {
|
|
|
275
339
|
process.nextTick(() => ipcServer.emit('shutdown-requested'));
|
|
276
340
|
return { ok: true };
|
|
277
341
|
});
|
|
342
|
+
// Debug methods — gated by QUICKSAVE_DEBUG / dev mode
|
|
343
|
+
if (!isDebugEnabled())
|
|
344
|
+
return;
|
|
345
|
+
// debug — full daemon introspection snapshot
|
|
346
|
+
ipcServer.registerMethod('debug', () => {
|
|
347
|
+
const connState = connection.getDebugState();
|
|
348
|
+
const claudeState = messageHandler.getClaudeService().getDebugState();
|
|
349
|
+
return {
|
|
350
|
+
pid: process.pid,
|
|
351
|
+
uptime: process.uptime(),
|
|
352
|
+
peers: connState.peers,
|
|
353
|
+
subscriptions: connState.subscriptions,
|
|
354
|
+
pendingInputs: claudeState.pendingInputs,
|
|
355
|
+
activeSessions: claudeState.activeSessions,
|
|
356
|
+
};
|
|
357
|
+
});
|
|
358
|
+
// resolve-input — force-resolve a stuck permission request
|
|
359
|
+
ipcServer.registerMethod('resolve-input', (params) => {
|
|
360
|
+
const requestId = params.requestId;
|
|
361
|
+
const action = params.action || 'allow';
|
|
362
|
+
if (!requestId)
|
|
363
|
+
throw Object.assign(new Error('Missing requestId'), { rpcCode: -32602 });
|
|
364
|
+
const resolved = messageHandler.getClaudeService().resolveUserInput({
|
|
365
|
+
requestId,
|
|
366
|
+
sessionId: '',
|
|
367
|
+
action: action,
|
|
368
|
+
});
|
|
369
|
+
return { resolved };
|
|
370
|
+
});
|
|
371
|
+
// list-sessions — SDK sessions enriched with live state
|
|
372
|
+
ipcServer.registerMethod('list-sessions', async (params) => {
|
|
373
|
+
const cwd = params.cwd || getManagedRepos()[0] || process.cwd();
|
|
374
|
+
const sessions = await messageHandler.getClaudeService().listAvailableSessions(cwd);
|
|
375
|
+
return { sessions };
|
|
376
|
+
});
|
|
377
|
+
// get-cards — card history for a session
|
|
378
|
+
ipcServer.registerMethod('get-cards', async (params) => {
|
|
379
|
+
const sessionId = params.sessionId;
|
|
380
|
+
const cwd = params.cwd || getManagedRepos()[0] || process.cwd();
|
|
381
|
+
const offset = params.offset || 0;
|
|
382
|
+
const limit = params.limit || 50;
|
|
383
|
+
if (!sessionId)
|
|
384
|
+
throw Object.assign(new Error('Missing sessionId'), { rpcCode: -32602 });
|
|
385
|
+
return messageHandler.getClaudeService().getCards(sessionId, cwd, offset, limit);
|
|
386
|
+
});
|
|
278
387
|
}
|
|
279
388
|
// ---------------------------------------------------------------------------
|
|
280
389
|
// Repo validation helper
|