@shinobiapps/shinobi 0.2.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +86 -0
- package/README.md +16 -8
- package/SECURITY.md +1 -1
- package/dist/cli.js +79 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/dispatch.d.ts +11 -0
- package/dist/commands/dispatch.d.ts.map +1 -0
- package/dist/commands/dispatch.js +100 -0
- package/dist/commands/dispatch.js.map +1 -0
- package/dist/commands/swarm.d.ts +16 -0
- package/dist/commands/swarm.d.ts.map +1 -0
- package/dist/commands/swarm.js +101 -0
- package/dist/commands/swarm.js.map +1 -0
- package/dist/lib/paths.d.ts +3 -2
- package/dist/lib/paths.d.ts.map +1 -1
- package/dist/lib/paths.js +4 -3
- package/dist/lib/paths.js.map +1 -1
- package/dist/models/dead_ends.d.ts.map +1 -1
- package/dist/models/dead_ends.js +12 -6
- package/dist/models/dead_ends.js.map +1 -1
- package/dist/models/subtasks.d.ts +7 -0
- package/dist/models/subtasks.d.ts.map +1 -1
- package/dist/models/subtasks.js +15 -0
- package/dist/models/subtasks.js.map +1 -1
- package/dist/server/tools/findings.d.ts +3 -0
- package/dist/server/tools/findings.d.ts.map +1 -0
- package/dist/server/tools/findings.js +106 -0
- package/dist/server/tools/findings.js.map +1 -0
- package/dist/server/tools/index.d.ts.map +1 -1
- package/dist/server/tools/index.js +4 -0
- package/dist/server/tools/index.js.map +1 -1
- package/dist/server/tools/notify.d.ts +3 -0
- package/dist/server/tools/notify.d.ts.map +1 -0
- package/dist/server/tools/notify.js +75 -0
- package/dist/server/tools/notify.js.map +1 -0
- package/dist/server/tools/subtasks.d.ts.map +1 -1
- package/dist/server/tools/subtasks.js +30 -5
- package/dist/server/tools/subtasks.js.map +1 -1
- package/dist/services/dispatch/loop.d.ts +12 -0
- package/dist/services/dispatch/loop.d.ts.map +1 -0
- package/dist/services/dispatch/loop.js +71 -0
- package/dist/services/dispatch/loop.js.map +1 -0
- package/dist/services/dispatch/types.d.ts +22 -0
- package/dist/services/dispatch/types.d.ts.map +1 -0
- package/dist/services/dispatch/types.js +2 -0
- package/dist/services/dispatch/types.js.map +1 -0
- package/dist/services/dispatch/worker.d.ts +20 -0
- package/dist/services/dispatch/worker.d.ts.map +1 -0
- package/dist/services/dispatch/worker.js +63 -0
- package/dist/services/dispatch/worker.js.map +1 -0
- package/dist/services/dispatch/worktree.d.ts +16 -0
- package/dist/services/dispatch/worktree.d.ts.map +1 -0
- package/dist/services/dispatch/worktree.js +60 -0
- package/dist/services/dispatch/worktree.js.map +1 -0
- package/dist/services/findings/plan.d.ts +25 -0
- package/dist/services/findings/plan.d.ts.map +1 -0
- package/dist/services/findings/plan.js +53 -0
- package/dist/services/findings/plan.js.map +1 -0
- package/dist/services/push/web-push.d.ts +10 -0
- package/dist/services/push/web-push.d.ts.map +1 -1
- package/dist/services/push/web-push.js +17 -0
- package/dist/services/push/web-push.js.map +1 -1
- package/docs/deploy-gcp-free.md +18 -5
- package/docs/remote-mcp.md +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
// One iteration of the dispatch loop: pull the next ready task, claim it, run a
|
|
2
|
+
// worker against it, then either complete it (+ "done" push) or hand it back to
|
|
3
|
+
// the queue and buzz the operator (blocked). Kept worker- and notifier-injected
|
|
4
|
+
// so the whole transition is unit-testable without spawning processes or sending
|
|
5
|
+
// real pushes. The long-running loop + sleep/relay-wake lives in the CLI command.
|
|
6
|
+
import { recordActivity } from '../../models/activity.js';
|
|
7
|
+
import { claimNextTask, completeSubtask, updateSubtask, } from '../../models/subtasks.js';
|
|
8
|
+
import { sendPushSafe } from '../push/web-push.js';
|
|
9
|
+
/** Default notifier: best-effort web push reusing the #523 primitives. */
|
|
10
|
+
export const defaultNotifier = async ({ kind, task, detail }) => {
|
|
11
|
+
const title = kind === 'task_completed' ? 'Shinobi: task done' : 'Shinobi: agent blocked';
|
|
12
|
+
const raw = detail ? `${task.title} — ${detail}` : task.title;
|
|
13
|
+
await sendPushSafe({
|
|
14
|
+
title,
|
|
15
|
+
body: raw.length > 160 ? raw.slice(0, 160) + '…' : raw,
|
|
16
|
+
tag: kind === 'task_completed' ? `task-${task.id}` : 'notify-blocked',
|
|
17
|
+
url: '/',
|
|
18
|
+
data: { kind, subtask_id: task.id },
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
export async function runDispatchCycle(opts) {
|
|
22
|
+
const { sessionId, worker, projectId } = opts;
|
|
23
|
+
const notifier = opts.notifier ?? defaultNotifier;
|
|
24
|
+
// Atomic select-and-claim so parallel swarm agents never grab the same task.
|
|
25
|
+
const task = claimNextTask(sessionId, projectId !== undefined ? { projectId } : {});
|
|
26
|
+
if (!task)
|
|
27
|
+
return { outcome: 'idle', task: null, detail: null };
|
|
28
|
+
recordActivity({
|
|
29
|
+
project_id: task.project_id,
|
|
30
|
+
session_id: sessionId,
|
|
31
|
+
action_type: 'dispatch_claim',
|
|
32
|
+
action_details: task.title,
|
|
33
|
+
entity_type: 'subtask',
|
|
34
|
+
entity_id: task.id,
|
|
35
|
+
});
|
|
36
|
+
let result;
|
|
37
|
+
try {
|
|
38
|
+
result = await worker(task);
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
result = { ok: false, detail: err instanceof Error ? err.message : String(err) };
|
|
42
|
+
}
|
|
43
|
+
const detail = result.detail ?? null;
|
|
44
|
+
if (result.ok) {
|
|
45
|
+
completeSubtask(task.id);
|
|
46
|
+
recordActivity({
|
|
47
|
+
project_id: task.project_id,
|
|
48
|
+
session_id: sessionId,
|
|
49
|
+
action_type: 'complete_task',
|
|
50
|
+
action_details: detail ?? task.title,
|
|
51
|
+
entity_type: 'subtask',
|
|
52
|
+
entity_id: task.id,
|
|
53
|
+
});
|
|
54
|
+
await notifier({ kind: 'task_completed', task, detail });
|
|
55
|
+
return { outcome: 'completed', task, detail };
|
|
56
|
+
}
|
|
57
|
+
// Blocked: hand the task back to the queue so it is not stuck in_progress, and
|
|
58
|
+
// buzz the operator — a human decision is needed before it can move.
|
|
59
|
+
updateSubtask(task.id, { status: 'todo' });
|
|
60
|
+
recordActivity({
|
|
61
|
+
project_id: task.project_id,
|
|
62
|
+
session_id: sessionId,
|
|
63
|
+
action_type: 'dispatch_blocked',
|
|
64
|
+
action_details: detail ?? task.title,
|
|
65
|
+
entity_type: 'subtask',
|
|
66
|
+
entity_id: task.id,
|
|
67
|
+
});
|
|
68
|
+
await notifier({ kind: 'blocked', task, detail });
|
|
69
|
+
return { outcome: 'blocked', task, detail };
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=loop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../../src/services/dispatch/loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { Subtask } from '../../models/subtasks.js';
|
|
2
|
+
/** Result of a worker attempting one task. ok=false means the agent is blocked. */
|
|
3
|
+
export interface WorkerResult {
|
|
4
|
+
ok: boolean;
|
|
5
|
+
detail?: string;
|
|
6
|
+
}
|
|
7
|
+
/** Executes a single task. Resolves (never rejects) with a WorkerResult. */
|
|
8
|
+
export type Worker = (task: Subtask) => Promise<WorkerResult>;
|
|
9
|
+
export type DispatchOutcome = 'completed' | 'blocked' | 'idle';
|
|
10
|
+
export interface DispatchCycleResult {
|
|
11
|
+
outcome: DispatchOutcome;
|
|
12
|
+
task: Subtask | null;
|
|
13
|
+
detail: string | null;
|
|
14
|
+
}
|
|
15
|
+
export interface NotifySignal {
|
|
16
|
+
kind: 'task_completed' | 'blocked';
|
|
17
|
+
task: Subtask;
|
|
18
|
+
detail: string | null;
|
|
19
|
+
}
|
|
20
|
+
/** Side-channel that buzzes the operator. Injected so it can be stubbed in tests. */
|
|
21
|
+
export type DispatchNotifier = (signal: NotifySignal) => Promise<void>;
|
|
22
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/services/dispatch/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,mFAAmF;AACnF,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,4EAA4E;AAC5E,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;AAE9D,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;AAE/D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,qFAAqF;AACrF,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/dispatch/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { Subtask } from '../../models/subtasks.js';
|
|
2
|
+
import type { Worker } from './types.js';
|
|
3
|
+
/** Build the plain-text prompt a headless worker receives for a task. */
|
|
4
|
+
export declare function buildPrompt(task: Subtask): string;
|
|
5
|
+
/**
|
|
6
|
+
* Dry-run worker — never executes anything; logs what it would dispatch and
|
|
7
|
+
* reports success. The default when no SHINOBI_WORKER_CMD is set, so `shinobi
|
|
8
|
+
* dispatch` is safe to demo and exercise without Claude Code on the box.
|
|
9
|
+
*/
|
|
10
|
+
export declare function dryRunWorker(log?: (msg: string) => void): Worker;
|
|
11
|
+
/**
|
|
12
|
+
* Command worker — spawns a shell command per task. The task is exposed to the
|
|
13
|
+
* command via env vars (SHINOBI_TASK_ID / _TITLE / _PROMPT) rather than string
|
|
14
|
+
* interpolation, so task text can never break out into the shell. Reference it
|
|
15
|
+
* explicitly, e.g. SHINOBI_WORKER_CMD='claude -p "$SHINOBI_TASK_PROMPT"'.
|
|
16
|
+
*
|
|
17
|
+
* Exit code 0 → ok (task done); any non-zero / spawn error / timeout → blocked.
|
|
18
|
+
*/
|
|
19
|
+
export declare function spawnCommandWorker(template: string, timeoutMs?: number): Worker;
|
|
20
|
+
//# sourceMappingURL=worker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/services/dispatch/worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,YAAY,CAAC;AAEvD,yEAAyE;AACzE,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAIjD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAsB,GAAG,MAAM,CAKjF;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,SAAiB,GAAG,MAAM,CAqCvF"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process';
|
|
2
|
+
/** Build the plain-text prompt a headless worker receives for a task. */
|
|
3
|
+
export function buildPrompt(task) {
|
|
4
|
+
const parts = [`Work on Shinobi task #${task.id}: ${task.title}`];
|
|
5
|
+
if (task.description)
|
|
6
|
+
parts.push('', task.description);
|
|
7
|
+
return parts.join('\n');
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Dry-run worker — never executes anything; logs what it would dispatch and
|
|
11
|
+
* reports success. The default when no SHINOBI_WORKER_CMD is set, so `shinobi
|
|
12
|
+
* dispatch` is safe to demo and exercise without Claude Code on the box.
|
|
13
|
+
*/
|
|
14
|
+
export function dryRunWorker(log = () => undefined) {
|
|
15
|
+
return (task) => {
|
|
16
|
+
log(`[dry-run] would dispatch task #${task.id}: ${task.title}`);
|
|
17
|
+
return Promise.resolve({ ok: true, detail: 'dry-run (no SHINOBI_WORKER_CMD configured)' });
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Command worker — spawns a shell command per task. The task is exposed to the
|
|
22
|
+
* command via env vars (SHINOBI_TASK_ID / _TITLE / _PROMPT) rather than string
|
|
23
|
+
* interpolation, so task text can never break out into the shell. Reference it
|
|
24
|
+
* explicitly, e.g. SHINOBI_WORKER_CMD='claude -p "$SHINOBI_TASK_PROMPT"'.
|
|
25
|
+
*
|
|
26
|
+
* Exit code 0 → ok (task done); any non-zero / spawn error / timeout → blocked.
|
|
27
|
+
*/
|
|
28
|
+
export function spawnCommandWorker(template, timeoutMs = 30 * 60 * 1000) {
|
|
29
|
+
return (task) => new Promise((resolve) => {
|
|
30
|
+
const child = spawn(template, {
|
|
31
|
+
shell: true,
|
|
32
|
+
env: {
|
|
33
|
+
...process.env,
|
|
34
|
+
SHINOBI_TASK_ID: String(task.id),
|
|
35
|
+
SHINOBI_TASK_TITLE: task.title,
|
|
36
|
+
SHINOBI_TASK_PROMPT: buildPrompt(task),
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
let out = '';
|
|
40
|
+
const capture = (buf) => {
|
|
41
|
+
out += buf.toString();
|
|
42
|
+
if (out.length > 4000)
|
|
43
|
+
out = out.slice(-4000);
|
|
44
|
+
};
|
|
45
|
+
child.stdout?.on('data', capture);
|
|
46
|
+
child.stderr?.on('data', capture);
|
|
47
|
+
const timer = setTimeout(() => {
|
|
48
|
+
child.kill('SIGKILL');
|
|
49
|
+
resolve({ ok: false, detail: `worker timed out after ${Math.round(timeoutMs / 1000)}s` });
|
|
50
|
+
}, timeoutMs);
|
|
51
|
+
timer.unref?.();
|
|
52
|
+
child.on('error', (err) => {
|
|
53
|
+
clearTimeout(timer);
|
|
54
|
+
resolve({ ok: false, detail: `worker spawn failed: ${err.message}` });
|
|
55
|
+
});
|
|
56
|
+
child.on('close', (code) => {
|
|
57
|
+
clearTimeout(timer);
|
|
58
|
+
const tail = out.trim().slice(-300);
|
|
59
|
+
resolve({ ok: code === 0, detail: tail || `exit ${code ?? 'null'}` });
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/services/dispatch/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export interface Worktree {
|
|
2
|
+
agentId: string;
|
|
3
|
+
path: string;
|
|
4
|
+
branch: string;
|
|
5
|
+
}
|
|
6
|
+
/** True when cwd is inside a git work tree. */
|
|
7
|
+
export declare function isGitRepo(cwd: string): boolean;
|
|
8
|
+
/**
|
|
9
|
+
* Create `count` worktrees under baseDir, one per agent, each on its own branch
|
|
10
|
+
* forked from the current HEAD of repoCwd.
|
|
11
|
+
*/
|
|
12
|
+
export declare function createWorktrees(repoCwd: string, baseDir: string, count: number, label: string): Worktree[];
|
|
13
|
+
/** Remove one worktree (and optionally delete its branch). Best-effort. */
|
|
14
|
+
export declare function removeWorktree(repoCwd: string, wt: Worktree, deleteBranch?: boolean): void;
|
|
15
|
+
export declare function removeWorktrees(repoCwd: string, worktrees: Worktree[], deleteBranch?: boolean): void;
|
|
16
|
+
//# sourceMappingURL=worktree.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../../src/services/dispatch/worktree.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAUD,+CAA+C;AAC/C,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAM9C;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,QAAQ,EAAE,CAWZ;AAED,2EAA2E;AAC3E,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,UAAO,GAAG,IAAI,CAavF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,YAAY,UAAO,GAAG,IAAI,CAEjG"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// Git worktree isolation for the swarm: each agent gets its own working copy on
|
|
2
|
+
// its own branch, forked from HEAD, so N agents editing files in parallel never
|
|
3
|
+
// clobber each other. The shared Shinobi brain (DB) coordinates *which* task each
|
|
4
|
+
// agent works; worktrees coordinate *where* their edits land.
|
|
5
|
+
import { execFileSync } from 'node:child_process';
|
|
6
|
+
import { join } from 'node:path';
|
|
7
|
+
function git(args, cwd) {
|
|
8
|
+
return execFileSync('git', args, {
|
|
9
|
+
cwd,
|
|
10
|
+
encoding: 'utf-8',
|
|
11
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
12
|
+
}).trim();
|
|
13
|
+
}
|
|
14
|
+
/** True when cwd is inside a git work tree. */
|
|
15
|
+
export function isGitRepo(cwd) {
|
|
16
|
+
try {
|
|
17
|
+
return git(['rev-parse', '--is-inside-work-tree'], cwd) === 'true';
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Create `count` worktrees under baseDir, one per agent, each on its own branch
|
|
25
|
+
* forked from the current HEAD of repoCwd.
|
|
26
|
+
*/
|
|
27
|
+
export function createWorktrees(repoCwd, baseDir, count, label) {
|
|
28
|
+
const head = git(['rev-parse', 'HEAD'], repoCwd);
|
|
29
|
+
const created = [];
|
|
30
|
+
for (let i = 0; i < count; i++) {
|
|
31
|
+
const agentId = `agent-${i + 1}`;
|
|
32
|
+
const path = join(baseDir, agentId);
|
|
33
|
+
const branch = `swarm/${label}/${agentId}`;
|
|
34
|
+
git(['worktree', 'add', '-b', branch, path, head], repoCwd);
|
|
35
|
+
created.push({ agentId, path, branch });
|
|
36
|
+
}
|
|
37
|
+
return created;
|
|
38
|
+
}
|
|
39
|
+
/** Remove one worktree (and optionally delete its branch). Best-effort. */
|
|
40
|
+
export function removeWorktree(repoCwd, wt, deleteBranch = true) {
|
|
41
|
+
try {
|
|
42
|
+
git(['worktree', 'remove', '--force', wt.path], repoCwd);
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
// already gone / dirty — leave it for the operator
|
|
46
|
+
}
|
|
47
|
+
if (deleteBranch) {
|
|
48
|
+
try {
|
|
49
|
+
git(['branch', '-D', wt.branch], repoCwd);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
// branch may carry unmerged work the operator wants — ignore
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
export function removeWorktrees(repoCwd, worktrees, deleteBranch = true) {
|
|
57
|
+
for (const wt of worktrees)
|
|
58
|
+
removeWorktree(repoCwd, wt, deleteBranch);
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=worktree.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../src/services/dispatch/worktree.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,gFAAgF;AAChF,kFAAkF;AAClF,8DAA8D;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAQjC,SAAS,GAAG,CAAC,IAAc,EAAE,GAAW;IACtC,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE;QAC/B,GAAG;QACH,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAC,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,CAAC,WAAW,EAAE,uBAAuB,CAAC,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,OAAe,EACf,OAAe,EACf,KAAa,EACb,KAAa;IAEb,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,SAAS,KAAK,IAAI,OAAO,EAAE,CAAC;QAC3C,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,EAAY,EAAE,YAAY,GAAG,IAAI;IAC/E,IAAI,CAAC;QACH,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,mDAAmD;IACrD,CAAC;IACD,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,6DAA6D;QAC/D,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,SAAqB,EAAE,YAAY,GAAG,IAAI;IACzF,KAAK,MAAM,EAAE,IAAI,SAAS;QAAE,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;AACxE,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { Priority } from '../../models/projects.js';
|
|
2
|
+
import type { CreateSubtaskInput } from '../../models/subtasks.js';
|
|
3
|
+
export interface Finding {
|
|
4
|
+
title: string;
|
|
5
|
+
severity?: string;
|
|
6
|
+
file?: string;
|
|
7
|
+
description?: string;
|
|
8
|
+
remediation?: string;
|
|
9
|
+
}
|
|
10
|
+
export interface PlannedTask {
|
|
11
|
+
input: CreateSubtaskInput;
|
|
12
|
+
/** Normalized repo-relative file the finding touches, or null. */
|
|
13
|
+
file: string | null;
|
|
14
|
+
/** Index of the prior same-file task this one must wait for, or null. */
|
|
15
|
+
dependsOnIndex: number | null;
|
|
16
|
+
}
|
|
17
|
+
/** Map a finding severity to a task priority. Unknown / missing → medium. */
|
|
18
|
+
export declare function severityToPriority(severity: string | undefined): Priority;
|
|
19
|
+
export interface PlanOptions {
|
|
20
|
+
projectId?: number;
|
|
21
|
+
/** Chain findings on the same file so they run sequentially. Default true. */
|
|
22
|
+
chainSameFile?: boolean;
|
|
23
|
+
}
|
|
24
|
+
export declare function planFindings(findings: Finding[], opts?: PlanOptions): PlannedTask[];
|
|
25
|
+
//# sourceMappingURL=plan.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/services/findings/plan.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,kEAAkE;IAClE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,yEAAyE;IACzE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAYD,6EAA6E;AAC7E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAGzE;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,GAAE,WAAgB,GAAG,WAAW,EAAE,CA6BvF"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
// Audit→remediation: turn a list of findings (from a security review, linter, or
|
|
2
|
+
// code review) into a subtask graph the swarm can drain. The clever bit is the
|
|
3
|
+
// dependency edges: findings on the SAME file are chained (depends_on) so they
|
|
4
|
+
// run sequentially — no two agents edit the same file in parallel, so agent
|
|
5
|
+
// branches don't conflict — while findings on different files stay independent
|
|
6
|
+
// and fan out across the swarm.
|
|
7
|
+
import { normalizeFilePath } from '../../lib/paths.js';
|
|
8
|
+
const SEVERITY_PRIORITY = {
|
|
9
|
+
critical: 'urgent',
|
|
10
|
+
high: 'high',
|
|
11
|
+
medium: 'medium',
|
|
12
|
+
moderate: 'medium',
|
|
13
|
+
low: 'low',
|
|
14
|
+
info: 'low',
|
|
15
|
+
informational: 'low',
|
|
16
|
+
};
|
|
17
|
+
/** Map a finding severity to a task priority. Unknown / missing → medium. */
|
|
18
|
+
export function severityToPriority(severity) {
|
|
19
|
+
if (!severity)
|
|
20
|
+
return 'medium';
|
|
21
|
+
return SEVERITY_PRIORITY[severity.trim().toLowerCase()] ?? 'medium';
|
|
22
|
+
}
|
|
23
|
+
export function planFindings(findings, opts = {}) {
|
|
24
|
+
const chain = opts.chainSameFile !== false;
|
|
25
|
+
const lastIndexForFile = new Map();
|
|
26
|
+
const planned = [];
|
|
27
|
+
findings.forEach((finding, i) => {
|
|
28
|
+
const file = finding.file ? normalizeFilePath(finding.file) : null;
|
|
29
|
+
const priority = severityToPriority(finding.severity);
|
|
30
|
+
const title = finding.severity ? `[${finding.severity.trim().toLowerCase()}] ${finding.title}` : finding.title;
|
|
31
|
+
const descParts = [];
|
|
32
|
+
if (finding.description)
|
|
33
|
+
descParts.push(finding.description);
|
|
34
|
+
if (finding.remediation)
|
|
35
|
+
descParts.push(`Remediation: ${finding.remediation}`);
|
|
36
|
+
if (file)
|
|
37
|
+
descParts.push(`File: ${file}`);
|
|
38
|
+
const input = { title, priority, sort_order: i };
|
|
39
|
+
if (opts.projectId !== undefined)
|
|
40
|
+
input.project_id = opts.projectId;
|
|
41
|
+
if (descParts.length > 0)
|
|
42
|
+
input.description = descParts.join('\n\n');
|
|
43
|
+
let dependsOnIndex = null;
|
|
44
|
+
if (chain && file && lastIndexForFile.has(file)) {
|
|
45
|
+
dependsOnIndex = lastIndexForFile.get(file);
|
|
46
|
+
}
|
|
47
|
+
if (file)
|
|
48
|
+
lastIndexForFile.set(file, i);
|
|
49
|
+
planned.push({ input, file, dependsOnIndex });
|
|
50
|
+
});
|
|
51
|
+
return planned;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=plan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/services/findings/plan.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,+EAA+E;AAC/E,+EAA+E;AAC/E,4EAA4E;AAC5E,+EAA+E;AAC/E,gCAAgC;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAoBvD,MAAM,iBAAiB,GAA6B;IAClD,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,KAAK;IACX,aAAa,EAAE,KAAK;CACrB,CAAC;AAEF,6EAA6E;AAC7E,MAAM,UAAU,kBAAkB,CAAC,QAA4B;IAC7D,IAAI,CAAC,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC/B,OAAO,iBAAiB,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,QAAQ,CAAC;AACtE,CAAC;AAQD,MAAM,UAAU,YAAY,CAAC,QAAmB,EAAE,OAAoB,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,KAAK,KAAK,CAAC;IAC3C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACnD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAElC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAE/G,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,WAAW;YAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC7D,IAAI,OAAO,CAAC,WAAW;YAAE,SAAS,CAAC,IAAI,CAAC,gBAAgB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/E,IAAI,IAAI;YAAE,SAAS,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAuB,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;QACrE,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;YAAE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;QACpE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,KAAK,CAAC,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErE,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,KAAK,IAAI,IAAI,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,cAAc,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC/C,CAAC;QACD,IAAI,IAAI;YAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAExC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -22,5 +22,15 @@ export interface PushDeliveryResult {
|
|
|
22
22
|
failed: number;
|
|
23
23
|
pruned_endpoints: string[];
|
|
24
24
|
}
|
|
25
|
+
export interface SafePushResult extends PushDeliveryResult {
|
|
26
|
+
error: string | null;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Best-effort variant of sendPushToAll: never throws. A failure to deliver a
|
|
30
|
+
* notification must never break the caller's primary flow (e.g. completing a
|
|
31
|
+
* task or signalling that an agent is blocked). Per-subscription errors are
|
|
32
|
+
* already absorbed inside sendPushToAll; this also guards VAPID bootstrap.
|
|
33
|
+
*/
|
|
34
|
+
export declare function sendPushSafe(payload: PushPayload): Promise<SafePushResult>;
|
|
25
35
|
export declare function sendPushToAll(payload: PushPayload): Promise<PushDeliveryResult>;
|
|
26
36
|
//# sourceMappingURL=web-push.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-push.d.ts","sourceRoot":"","sources":["../../../src/services/push/web-push.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,wBAAgB,qBAAqB,IAAI,WAAW,CA4BnD;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyCrF"}
|
|
1
|
+
{"version":3,"file":"web-push.d.ts","sourceRoot":"","sources":["../../../src/services/push/web-push.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,wBAAgB,qBAAqB,IAAI,WAAW,CA4BnD;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAShF;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyCrF"}
|
|
@@ -43,6 +43,23 @@ export function ensureVapidConfigured() {
|
|
|
43
43
|
subject: existing.subject,
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* Best-effort variant of sendPushToAll: never throws. A failure to deliver a
|
|
48
|
+
* notification must never break the caller's primary flow (e.g. completing a
|
|
49
|
+
* task or signalling that an agent is blocked). Per-subscription errors are
|
|
50
|
+
* already absorbed inside sendPushToAll; this also guards VAPID bootstrap.
|
|
51
|
+
*/
|
|
52
|
+
export async function sendPushSafe(payload) {
|
|
53
|
+
try {
|
|
54
|
+
const result = await sendPushToAll(payload);
|
|
55
|
+
return { ...result, error: null };
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
59
|
+
stderr.write(`web-push: sendPushSafe swallowed error: ${msg.slice(0, 160)}\n`);
|
|
60
|
+
return { total: 0, succeeded: 0, failed: 0, pruned_endpoints: [], error: msg.slice(0, 500) };
|
|
61
|
+
}
|
|
62
|
+
}
|
|
46
63
|
export async function sendPushToAll(payload) {
|
|
47
64
|
ensureVapidConfigured();
|
|
48
65
|
const subscriptions = listSubscriptions();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-push.js","sourceRoot":"","sources":["../../../src/services/push/web-push.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,iEAAiE;AAEjE,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AACvH,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAE/E,MAAM,eAAe,GAAG,+BAA+B,CAAC;AAExD,IAAI,UAAU,GAAG,KAAK,CAAC;AAQvB,SAAS,gBAAgB;IACvB,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC,MAAM,CAAC;IACjC,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,0BAA0B,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,IAAI;QAC7F,UAAU,EAAE,GAAG,CAAC,2BAA2B,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,IAAI;QAChG,OAAO,EAAE,GAAG,CAAC,uBAAuB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,eAAe;KACjG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IACpC,IAAI,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;YACnF,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO;YACL,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC;IACJ,CAAC;IACD,2EAA2E;IAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC9C,aAAa,CAAC;QACZ,wBAAwB,EAAE,SAAS,CAAC,SAAS;QAC7C,yBAAyB,EAAE,SAAS,CAAC,UAAU;QAC/C,qBAAqB,EAAE,QAAQ,CAAC,OAAO;KACxC,CAAC,CAAC;IACH,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IACrF,UAAU,GAAG,IAAI,CAAC;IAClB,MAAM,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAC;IACzF,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"web-push.js","sourceRoot":"","sources":["../../../src/services/push/web-push.ts"],"names":[],"mappings":"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"}
|
package/docs/deploy-gcp-free.md
CHANGED
|
@@ -45,19 +45,32 @@ sudo fallocate -l 2G /swapfile && sudo chmod 600 /swapfile && sudo mkswap /swapf
|
|
|
45
45
|
echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
|
|
46
46
|
```
|
|
47
47
|
|
|
48
|
-
Docker
|
|
48
|
+
Install Docker:
|
|
49
49
|
|
|
50
50
|
```bash
|
|
51
51
|
sudo apt update && sudo apt install -y docker.io git
|
|
52
52
|
sudo usermod -aG docker $USER
|
|
53
53
|
exit # reopen SSH so the docker group applies
|
|
54
|
+
```
|
|
55
|
+
|
|
56
|
+
Then get the image one of two ways:
|
|
57
|
+
|
|
58
|
+
**A. Pull the prebuilt image (fastest — recommended).** Released to Docker Hub
|
|
59
|
+
on every version tag, multi-arch (amd64/arm64), no build step:
|
|
60
|
+
|
|
61
|
+
```bash
|
|
62
|
+
docker pull shinobiapps/shinobi:latest
|
|
63
|
+
```
|
|
54
64
|
|
|
65
|
+
**B. Build from source** (if you want a specific commit or local changes):
|
|
66
|
+
|
|
67
|
+
```bash
|
|
55
68
|
git clone https://github.com/numbererikson/shinobi && cd shinobi
|
|
56
|
-
docker build -t shinobi .
|
|
69
|
+
docker build -t shinobiapps/shinobi:latest .
|
|
57
70
|
```
|
|
58
71
|
|
|
59
|
-
> ⏳
|
|
60
|
-
> TypeScript/Vite steps. It isn't.
|
|
72
|
+
> ⏳ Building on e2-micro takes 10–15 minutes and looks frozen during the
|
|
73
|
+
> TypeScript/Vite steps. It isn't. Prefer the prebuilt pull (A) on the tiny VM.
|
|
61
74
|
|
|
62
75
|
## 3. Run it
|
|
63
76
|
|
|
@@ -67,7 +80,7 @@ docker run -d --name shinobi --restart unless-stopped \
|
|
|
67
80
|
-p 127.0.0.1:8765:8765 \
|
|
68
81
|
-v shinobi-data:/data \
|
|
69
82
|
-e SHINOBI_DASHBOARD_TOKEN=$TOKEN \
|
|
70
|
-
shinobi
|
|
83
|
+
shinobiapps/shinobi:latest
|
|
71
84
|
|
|
72
85
|
curl http://127.0.0.1:8765/health # → {"ok":true,...}
|
|
73
86
|
```
|
package/docs/remote-mcp.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
By default Shinobi runs local-first: the MCP server speaks stdio and the
|
|
4
4
|
SQLite database lives in `~/.shinobi/` on one machine. Remote mode exposes the
|
|
5
|
-
same
|
|
5
|
+
same 38 tools over MCP **streamable HTTP** so any MCP client — Claude Code
|
|
6
6
|
(desktop *and* web/mobile sessions), Cursor, Cline, Continue.dev, Zed — can
|
|
7
7
|
share a single brain hosted on a server you control.
|
|
8
8
|
|