@phnx-labs/agents-cli 1.20.15 → 1.20.16

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.
Files changed (37) hide show
  1. package/CHANGELOG.md +5 -0
  2. package/dist/commands/secrets.js +53 -1
  3. package/dist/commands/sessions-sync.d.ts +13 -0
  4. package/dist/commands/sessions-sync.js +73 -0
  5. package/dist/commands/sessions.js +2 -0
  6. package/dist/commands/view.js +11 -3
  7. package/dist/index.js +1 -1
  8. package/dist/lib/agents.d.ts +11 -0
  9. package/dist/lib/agents.js +11 -9
  10. package/dist/lib/daemon.d.ts +19 -0
  11. package/dist/lib/daemon.js +97 -2
  12. package/dist/lib/migrate.d.ts +22 -0
  13. package/dist/lib/migrate.js +99 -1
  14. package/dist/lib/plugin-marketplace.d.ts +15 -0
  15. package/dist/lib/plugin-marketplace.js +44 -0
  16. package/dist/lib/secrets/index.js +20 -0
  17. package/dist/lib/session/parse.d.ts +2 -0
  18. package/dist/lib/session/parse.js +168 -2
  19. package/dist/lib/session/sync/agents.d.ts +46 -0
  20. package/dist/lib/session/sync/agents.js +94 -0
  21. package/dist/lib/session/sync/config.d.ts +30 -0
  22. package/dist/lib/session/sync/config.js +58 -0
  23. package/dist/lib/session/sync/crdt.d.ts +44 -0
  24. package/dist/lib/session/sync/crdt.js +119 -0
  25. package/dist/lib/session/sync/manifest.d.ts +51 -0
  26. package/dist/lib/session/sync/manifest.js +96 -0
  27. package/dist/lib/session/sync/r2.d.ts +32 -0
  28. package/dist/lib/session/sync/r2.js +121 -0
  29. package/dist/lib/session/sync/sync.d.ts +82 -0
  30. package/dist/lib/session/sync/sync.js +251 -0
  31. package/dist/lib/shims.d.ts +1 -1
  32. package/dist/lib/shims.js +17 -1
  33. package/dist/lib/teams/parsers.js +159 -1
  34. package/dist/lib/usage.d.ts +18 -0
  35. package/dist/lib/usage.js +25 -0
  36. package/dist/lib/versions.js +30 -13
  37. package/package.json +2 -1
@@ -98,6 +98,21 @@ export declare function knownMarketplacesPath(agent: AgentId, versionHome: strin
98
98
  * Internal symlinks (target stays inside the plugin root) are preserved.
99
99
  */
100
100
  export declare function copyPluginToMarketplace(plugin: DiscoveredPlugin, spec: MarketplaceSpec | string, agent: AgentId, versionHome: string): string;
101
+ /**
102
+ * Claude Code's plugin-manifest schema requires the resource path fields to be
103
+ * relative paths starting with "./" — `skills`/`commands`/`agents` are
104
+ * `union([startsWith("./"), array(startsWith("./"))])` (verified against the
105
+ * Claude Code binary). Bare names like "loop" fail validation and Claude rejects
106
+ * the ENTIRE plugin at load time, surfacing only in its `/plugin` > Errors tab.
107
+ *
108
+ * agents-cli copies plugin.json verbatim into the marketplace, so a malformed
109
+ * manifest ships looking fully installed while loading nothing. This catches the
110
+ * unambiguous type violation (non-"./" string entries) and returns one warning
111
+ * per offending field so the caller can surface it loudly. `hooks`/`mcpServers`
112
+ * are intentionally skipped — they legitimately accept inline objects, so a path
113
+ * check would false-positive.
114
+ */
115
+ export declare function validateClaudePluginManifest(manifest: unknown): string[];
101
116
  /**
102
117
  * Re-synthesize <marketplace>/.claude-plugin/marketplace.json from the plugins
103
118
  * already installed under <marketplace>/plugins/. Always run after add or remove
@@ -185,6 +185,47 @@ export function copyPluginToMarketplace(plugin, spec, agent, versionHome) {
185
185
  }
186
186
  return dest;
187
187
  }
188
+ // ─── Manifest validation ─────────────────────────────────────────────────────
189
+ /**
190
+ * Claude Code's plugin-manifest schema requires the resource path fields to be
191
+ * relative paths starting with "./" — `skills`/`commands`/`agents` are
192
+ * `union([startsWith("./"), array(startsWith("./"))])` (verified against the
193
+ * Claude Code binary). Bare names like "loop" fail validation and Claude rejects
194
+ * the ENTIRE plugin at load time, surfacing only in its `/plugin` > Errors tab.
195
+ *
196
+ * agents-cli copies plugin.json verbatim into the marketplace, so a malformed
197
+ * manifest ships looking fully installed while loading nothing. This catches the
198
+ * unambiguous type violation (non-"./" string entries) and returns one warning
199
+ * per offending field so the caller can surface it loudly. `hooks`/`mcpServers`
200
+ * are intentionally skipped — they legitimately accept inline objects, so a path
201
+ * check would false-positive.
202
+ */
203
+ export function validateClaudePluginManifest(manifest) {
204
+ const warnings = [];
205
+ if (!manifest || typeof manifest !== 'object')
206
+ return warnings;
207
+ const m = manifest;
208
+ for (const field of ['skills', 'commands', 'agents']) {
209
+ const value = m[field];
210
+ if (value === undefined || value === null)
211
+ continue;
212
+ const entries = Array.isArray(value) ? value : [value];
213
+ for (const entry of entries) {
214
+ if (typeof entry !== 'string') {
215
+ warnings.push(`plugin.json field "${field}" must contain relative paths starting with "./" ` +
216
+ `(e.g. "./${field}/<name>"); found a non-string value. Claude Code will reject the whole plugin.`);
217
+ break;
218
+ }
219
+ if (!entry.startsWith('./')) {
220
+ warnings.push(`plugin.json field "${field}" entry "${entry}" must be a relative path starting with "./" ` +
221
+ `(e.g. "./${field}/${entry}"). Claude Code rejects the entire plugin otherwise — ` +
222
+ `remove the field to auto-discover from ${field}/, or use relative paths.`);
223
+ break;
224
+ }
225
+ }
226
+ }
227
+ return warnings;
228
+ }
188
229
  // ─── Catalog synthesis ──────────────────────────────────────────────────────
189
230
  /**
190
231
  * Re-synthesize <marketplace>/.claude-plugin/marketplace.json from the plugins
@@ -226,6 +267,9 @@ export function syncMarketplaceManifest(spec, agent, versionHome) {
226
267
  catch {
227
268
  continue;
228
269
  }
270
+ for (const warning of validateClaudePluginManifest(manifest)) {
271
+ process.stderr.write(`agents-cli: plugin '${manifest.name ?? entry.name}': ${warning}\n`);
272
+ }
229
273
  entries.push({
230
274
  name: manifest.name,
231
275
  source: `./plugins/${manifest.name}`,
@@ -236,6 +236,26 @@ export function setKeychainToken(item, value) {
236
236
  linuxBackend.set(item, value);
237
237
  return;
238
238
  }
239
+ // Bare (non-`agents-cli.`) items are written WITHOUT the biometry ACL so
240
+ // they round-trip with the no-prompt read path in getKeychainToken (which
241
+ // also uses /usr/bin/security for non-our items). This is what lets a
242
+ // SessionStart hook read e.g. `linear-api-key` silently on every launch.
243
+ // Routing these through the helper would attach a Touch ID ACL that the
244
+ // /usr/bin/security read can't satisfy without popping the legacy password
245
+ // sheet. -U upserts so repeated sets overwrite in place.
246
+ if (!isOurItem(item)) {
247
+ const sec = spawnSync('/usr/bin/security', [
248
+ 'add-generic-password', '-U',
249
+ '-a', os.userInfo().username,
250
+ '-s', item,
251
+ '-w', value,
252
+ ], { stdio: ['ignore', 'pipe', 'pipe'] });
253
+ if (sec.status !== 0) {
254
+ const msg = sec.stderr?.toString().trim();
255
+ throw new Error(msg || `Failed to write keychain item '${item}'.`);
256
+ }
257
+ return;
258
+ }
239
259
  const bin = getKeychainHelperPath();
240
260
  const result = spawnSync(bin, ['set', item, os.userInfo().username], {
241
261
  input: value,
@@ -49,3 +49,5 @@ export declare function parseOpenCode(filePath: string): SessionEvent[];
49
49
  export declare function parseRush(filePath: string): SessionEvent[];
50
50
  /** Parse a Hermes session JSON file into normalized events. */
51
51
  export declare function parseHermes(filePath: string): SessionEvent[];
52
+ /** Parse a Kimi session state.json file by reading its agents/main/wire.jsonl. */
53
+ export declare function parseKimi(filePath: string): SessionEvent[];
@@ -6,6 +6,7 @@
6
6
  * objects suitable for rendering, filtering, and summarization.
7
7
  */
8
8
  import * as fs from 'fs';
9
+ import * as path from 'path';
9
10
  import { execFileSync } from 'child_process';
10
11
  /**
11
12
  * Largest session file we will load into memory. Above this we throw a clean
@@ -106,8 +107,8 @@ export function parseSession(filePath, agent) {
106
107
  events = parseHermes(filePath);
107
108
  break;
108
109
  case 'kimi':
109
- events = [];
110
- break; // Kimi event parsing not implemented yet — discover.ts builds metadata only
110
+ events = parseKimi(filePath);
111
+ break;
111
112
  }
112
113
  // Chokepoint: every string field that originated in an untrusted session
113
114
  // file gets stripped of terminal escapes here, so renderers downstream can
@@ -130,6 +131,8 @@ export function detectAgent(filePath) {
130
131
  return 'rush';
131
132
  if (filePath.includes('/.hermes/') || filePath.includes('\\.hermes\\'))
132
133
  return 'hermes';
134
+ if (filePath.includes('/.kimi-code/') || filePath.includes('\\.kimi-code\\'))
135
+ return 'kimi';
133
136
  // Cloud convention: cloud-sessions/<id>/session.<format>.jsonl
134
137
  const cloudMatch = filePath.match(/session\.(claude|codex|rush)\.jsonl(?:$|[?#])/);
135
138
  if (cloudMatch)
@@ -958,3 +961,166 @@ function hermesContentToText(content) {
958
961
  .join('\n')
959
962
  .trim();
960
963
  }
964
+ // ---------------------------------------------------------------------------
965
+ // Kimi parser
966
+ //
967
+ // Kimi stores session metadata in state.json and the conversation transcript
968
+ // in agents/main/wire.jsonl under ~/.kimi-code/sessions/<workdir>/session_<uuid>/.
969
+ // wire.jsonl uses a role-based schema:
970
+ // - "context.append_message" with role=user/assistant -> messages
971
+ // - "context.append_loop_event" with content.part type=text/think -> message/thinking
972
+ // - "context.append_loop_event" with event.type=tool.call -> tool_use
973
+ // - "context.append_loop_event" with event.type=tool.result -> tool_result
974
+ // - "usage.record" -> usage
975
+ // ---------------------------------------------------------------------------
976
+ /** Parse a Kimi session state.json file by reading its agents/main/wire.jsonl. */
977
+ export function parseKimi(filePath) {
978
+ const sessionDir = path.dirname(filePath);
979
+ const wirePath = path.join(sessionDir, 'agents', 'main', 'wire.jsonl');
980
+ if (!fs.existsSync(wirePath)) {
981
+ return [];
982
+ }
983
+ const content = safeReadSessionFile(wirePath);
984
+ const lines = content.split('\n').filter(l => l.trim());
985
+ const events = [];
986
+ // Map tool.call uuid -> tool name so tool.result can carry the tool name.
987
+ const toolCallMap = new Map();
988
+ function extractMessageText(rawContent) {
989
+ if (typeof rawContent === 'string')
990
+ return rawContent.trim();
991
+ if (Array.isArray(rawContent)) {
992
+ return rawContent
993
+ .map((part) => (typeof part?.text === 'string' ? part.text : ''))
994
+ .join('')
995
+ .trim();
996
+ }
997
+ return '';
998
+ }
999
+ function timestampFrom(raw) {
1000
+ const t = raw?.time;
1001
+ if (typeof t === 'number' && t > 0) {
1002
+ return new Date(t).toISOString();
1003
+ }
1004
+ return new Date().toISOString();
1005
+ }
1006
+ for (const line of lines) {
1007
+ let raw;
1008
+ try {
1009
+ raw = JSON.parse(line);
1010
+ }
1011
+ catch {
1012
+ continue;
1013
+ }
1014
+ const type = raw?.type;
1015
+ const timestamp = timestampFrom(raw);
1016
+ if (type === 'context.append_message') {
1017
+ const message = raw.message || {};
1018
+ const role = message.role === 'user' ? 'user' : 'assistant';
1019
+ const text = extractMessageText(message.content);
1020
+ if (!text)
1021
+ continue;
1022
+ events.push({
1023
+ type: 'message',
1024
+ agent: 'kimi',
1025
+ timestamp,
1026
+ role,
1027
+ content: text,
1028
+ });
1029
+ }
1030
+ else if (type === 'context.append_loop_event') {
1031
+ const event = raw.event || {};
1032
+ const eventType = event.type;
1033
+ if (eventType === 'content.part') {
1034
+ const part = event.part || {};
1035
+ const partType = part.type;
1036
+ if (partType === 'text') {
1037
+ const text = typeof part.text === 'string' ? part.text.trim() : '';
1038
+ if (text) {
1039
+ events.push({
1040
+ type: 'message',
1041
+ agent: 'kimi',
1042
+ timestamp,
1043
+ role: 'assistant',
1044
+ content: text,
1045
+ });
1046
+ }
1047
+ }
1048
+ else if (partType === 'think') {
1049
+ const think = typeof part.think === 'string' ? part.think.trim() : '';
1050
+ if (think) {
1051
+ events.push({
1052
+ type: 'thinking',
1053
+ agent: 'kimi',
1054
+ timestamp,
1055
+ content: think,
1056
+ });
1057
+ }
1058
+ }
1059
+ }
1060
+ else if (eventType === 'tool.call') {
1061
+ const fn = event.function || {};
1062
+ const toolName = typeof event.name === 'string' ? event.name : (fn.name || 'unknown');
1063
+ let args = {};
1064
+ if (typeof fn.arguments === 'string') {
1065
+ try {
1066
+ args = JSON.parse(fn.arguments);
1067
+ }
1068
+ catch {
1069
+ args = { _raw: fn.arguments };
1070
+ }
1071
+ }
1072
+ else if (fn.arguments && typeof fn.arguments === 'object') {
1073
+ args = fn.arguments;
1074
+ }
1075
+ const callId = event.toolCallId || event.uuid;
1076
+ if (callId) {
1077
+ toolCallMap.set(callId, toolName);
1078
+ }
1079
+ events.push({
1080
+ type: 'tool_use',
1081
+ agent: 'kimi',
1082
+ timestamp,
1083
+ tool: toolName,
1084
+ args,
1085
+ path: args.path || args.file_path || undefined,
1086
+ command: toolName === 'Bash' ? args.command : undefined,
1087
+ });
1088
+ }
1089
+ else if (eventType === 'tool.result') {
1090
+ const callId = event.toolCallId || event.parentUuid;
1091
+ const toolName = (callId && toolCallMap.get(callId)) || 'unknown';
1092
+ const result = event.result || {};
1093
+ const output = typeof result.output === 'string' ? result.output : '';
1094
+ const isError = result.isError === true || (output && output.startsWith('Error:'));
1095
+ events.push({
1096
+ type: isError ? 'error' : 'tool_result',
1097
+ agent: 'kimi',
1098
+ timestamp,
1099
+ tool: toolName,
1100
+ success: !isError,
1101
+ output: output.length > 500 ? output.slice(0, 497) + '...' : output,
1102
+ });
1103
+ if (callId) {
1104
+ toolCallMap.delete(callId);
1105
+ }
1106
+ }
1107
+ }
1108
+ else if (type === 'usage.record') {
1109
+ const usage = raw.usage || {};
1110
+ const inputTokens = usage.inputOther ?? usage.input_tokens;
1111
+ const outputTokens = usage.output ?? usage.output_tokens;
1112
+ if ((typeof inputTokens === 'number' && inputTokens >= 0) ||
1113
+ (typeof outputTokens === 'number' && outputTokens >= 0)) {
1114
+ events.push({
1115
+ type: 'usage',
1116
+ agent: 'kimi',
1117
+ timestamp,
1118
+ model: raw.model || usage.model,
1119
+ inputTokens: typeof inputTokens === 'number' ? inputTokens : undefined,
1120
+ outputTokens: typeof outputTokens === 'number' ? outputTokens : undefined,
1121
+ });
1122
+ }
1123
+ }
1124
+ }
1125
+ return events;
1126
+ }
@@ -0,0 +1,46 @@
1
+ /**
2
+ * Per-agent adapter for sync. Each supported agent declares where its
3
+ * transcripts live and how to derive a session id and storage-relative key
4
+ * from a file path. The merge (crdt.ts) and transport (r2.ts) are fully
5
+ * agent-agnostic — adding a new agent is just another entry in SYNC_AGENTS.
6
+ *
7
+ * Mirror layout: synced-in transcripts land under
8
+ * ~/.agents/.history/backups/<agent>/<machine>/<subdir>/<relKey>
9
+ * which is already a scan root (getAgentSessionDirs scans backups/<agent>/<ts>),
10
+ * so the existing incremental scanner indexes them with no changes. Because the
11
+ * scanner dedups by session id with the live home scanned first, a session that
12
+ * also exists locally always wins — the mirror only ever fills in sessions
13
+ * originated on other machines.
14
+ */
15
+ export interface LocalTranscript {
16
+ /** Absolute path on this machine. */
17
+ absPath: string;
18
+ /** Globally-unique session id (the grouping key across machines). */
19
+ sessionId: string;
20
+ /** Path relative to the agent's subdir root — preserved in the mirror layout. */
21
+ relKey: string;
22
+ }
23
+ export interface SyncAgentSpec {
24
+ id: string;
25
+ /** Config subdir under the agent home that holds transcripts. */
26
+ subdir: string;
27
+ /** Derive the session id from a storage-relative key. */
28
+ sessionIdFromRelKey(relKey: string): string;
29
+ }
30
+ export declare const SYNC_AGENTS: SyncAgentSpec[];
31
+ /**
32
+ * List this machine's own transcript files for an agent, EXCLUDING the sync
33
+ * mirror (we never re-upload another machine's files under our prefix). Dedups
34
+ * by session id so a session present in multiple version homes is uploaded once.
35
+ */
36
+ export declare function listLocalTranscripts(spec: SyncAgentSpec): LocalTranscript[];
37
+ /** Session ids this machine holds locally (live home), used to skip mirror writes. */
38
+ export declare function localSessionIds(spec: SyncAgentSpec): Set<string>;
39
+ /** Absolute mirror path for a remote machine's transcript — lands in a scan root. */
40
+ export declare function mirrorPath(spec: SyncAgentSpec, machine: string, relKey: string): string;
41
+ /** R2 object key for a transcript: sessions/<machine>/<agent>/<sessionId>.jsonl */
42
+ export declare function objectKey(machine: string, agentId: string, sessionId: string): string;
43
+ /** R2 object key for a machine's manifest. */
44
+ export declare function manifestKey(machine: string): string;
45
+ /** Prefix under which all machine manifests live (for discovery). */
46
+ export declare const SESSIONS_PREFIX = "sessions/";
@@ -0,0 +1,94 @@
1
+ /**
2
+ * Per-agent adapter for sync. Each supported agent declares where its
3
+ * transcripts live and how to derive a session id and storage-relative key
4
+ * from a file path. The merge (crdt.ts) and transport (r2.ts) are fully
5
+ * agent-agnostic — adding a new agent is just another entry in SYNC_AGENTS.
6
+ *
7
+ * Mirror layout: synced-in transcripts land under
8
+ * ~/.agents/.history/backups/<agent>/<machine>/<subdir>/<relKey>
9
+ * which is already a scan root (getAgentSessionDirs scans backups/<agent>/<ts>),
10
+ * so the existing incremental scanner indexes them with no changes. Because the
11
+ * scanner dedups by session id with the live home scanned first, a session that
12
+ * also exists locally always wins — the mirror only ever fills in sessions
13
+ * originated on other machines.
14
+ */
15
+ import * as fs from 'fs';
16
+ import * as path from 'path';
17
+ import { getHistoryDir } from '../../state.js';
18
+ import { getAgentSessionDirs } from '../discover.js';
19
+ import { walkForFiles } from '../../fs-walk.js';
20
+ const UUID_RE = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
21
+ export const SYNC_AGENTS = [
22
+ {
23
+ id: 'claude',
24
+ subdir: 'projects',
25
+ // Claude transcripts are <projectDir>/<sessionId>.jsonl.
26
+ sessionIdFromRelKey: rel => path.basename(rel).replace(/\.jsonl$/, ''),
27
+ },
28
+ {
29
+ id: 'codex',
30
+ subdir: 'sessions',
31
+ // Codex transcripts are rollout-<ts>-<uuid>.jsonl under date dirs; the uuid
32
+ // is the session id (matches session_meta.payload.id).
33
+ sessionIdFromRelKey: rel => path.basename(rel).match(UUID_RE)?.[0] ?? rel,
34
+ },
35
+ ];
36
+ let cachedMirrorRoot = null;
37
+ function mirrorRootReal() {
38
+ if (cachedMirrorRoot)
39
+ return cachedMirrorRoot;
40
+ const root = path.join(getHistoryDir(), 'backups');
41
+ cachedMirrorRoot = safeReal(root);
42
+ return cachedMirrorRoot;
43
+ }
44
+ function safeReal(p) {
45
+ try {
46
+ return fs.realpathSync(p);
47
+ }
48
+ catch {
49
+ return path.resolve(p);
50
+ }
51
+ }
52
+ /**
53
+ * List this machine's own transcript files for an agent, EXCLUDING the sync
54
+ * mirror (we never re-upload another machine's files under our prefix). Dedups
55
+ * by session id so a session present in multiple version homes is uploaded once.
56
+ */
57
+ export function listLocalTranscripts(spec) {
58
+ const mirror = mirrorRootReal();
59
+ const out = [];
60
+ const seen = new Set();
61
+ for (const dir of getAgentSessionDirs(spec.id, spec.subdir)) {
62
+ if (safeReal(dir).startsWith(mirror))
63
+ continue; // skip synced-in mirror dirs
64
+ for (const abs of walkForFiles(dir, '.jsonl', 100_000)) {
65
+ const relKey = path.relative(dir, abs);
66
+ if (!relKey || relKey.startsWith('..'))
67
+ continue;
68
+ const sessionId = spec.sessionIdFromRelKey(relKey);
69
+ if (seen.has(sessionId))
70
+ continue;
71
+ seen.add(sessionId);
72
+ out.push({ absPath: abs, sessionId, relKey });
73
+ }
74
+ }
75
+ return out;
76
+ }
77
+ /** Session ids this machine holds locally (live home), used to skip mirror writes. */
78
+ export function localSessionIds(spec) {
79
+ return new Set(listLocalTranscripts(spec).map(t => t.sessionId));
80
+ }
81
+ /** Absolute mirror path for a remote machine's transcript — lands in a scan root. */
82
+ export function mirrorPath(spec, machine, relKey) {
83
+ return path.join(getHistoryDir(), 'backups', spec.id, machine, spec.subdir, relKey);
84
+ }
85
+ /** R2 object key for a transcript: sessions/<machine>/<agent>/<sessionId>.jsonl */
86
+ export function objectKey(machine, agentId, sessionId) {
87
+ return `sessions/${machine}/${agentId}/${sessionId}.jsonl`;
88
+ }
89
+ /** R2 object key for a machine's manifest. */
90
+ export function manifestKey(machine) {
91
+ return `sessions/${machine}/manifest.json`;
92
+ }
93
+ /** Prefix under which all machine manifests live (for discovery). */
94
+ export const SESSIONS_PREFIX = 'sessions/';
@@ -0,0 +1,30 @@
1
+ /**
2
+ * Configuration for cross-machine session sync: R2 credentials and this
3
+ * machine's stable identity. Credentials come from the `r2.backups` secrets
4
+ * bundle (OS keychain on macOS, libsecret on Linux) — never from env or disk.
5
+ */
6
+ /** Secrets bundle holding the R2 credentials. */
7
+ export declare const SYNC_BUNDLE = "r2.backups";
8
+ export interface R2Config {
9
+ accountId: string;
10
+ bucket: string;
11
+ accessKeyId: string;
12
+ secretAccessKey: string;
13
+ /** S3-compatible endpoint for the account (no bucket, no trailing slash). */
14
+ endpoint: string;
15
+ }
16
+ /**
17
+ * Resolve R2 credentials from the `r2.backups` bundle. Throws a clear,
18
+ * actionable error if the bundle or any key is missing — sync cannot proceed
19
+ * without real credentials (no silent fallback).
20
+ */
21
+ export declare function loadR2Config(): R2Config;
22
+ /** True when the sync bundle exists and looks resolvable, without throwing. */
23
+ export declare function isSyncConfigured(): boolean;
24
+ /**
25
+ * This machine's stable, human-readable id, used as its R2 prefix and mirror
26
+ * directory name. Tailnet hostnames (zion, yosemite-s0, mac-mini) are already
27
+ * unique and readable; we lowercase and strip any domain suffix. Overridable
28
+ * via AGENTS_SYNC_MACHINE_ID for tests and unusual setups.
29
+ */
30
+ export declare function machineId(): string;
@@ -0,0 +1,58 @@
1
+ /**
2
+ * Configuration for cross-machine session sync: R2 credentials and this
3
+ * machine's stable identity. Credentials come from the `r2.backups` secrets
4
+ * bundle (OS keychain on macOS, libsecret on Linux) — never from env or disk.
5
+ */
6
+ import * as os from 'os';
7
+ import { readAndResolveBundleEnv } from '../../secrets/bundles.js';
8
+ /** Secrets bundle holding the R2 credentials. */
9
+ export const SYNC_BUNDLE = 'r2.backups';
10
+ /**
11
+ * Resolve R2 credentials from the `r2.backups` bundle. Throws a clear,
12
+ * actionable error if the bundle or any key is missing — sync cannot proceed
13
+ * without real credentials (no silent fallback).
14
+ */
15
+ export function loadR2Config() {
16
+ const { env } = readAndResolveBundleEnv(SYNC_BUNDLE, { caller: 'sessions-sync' });
17
+ const accountId = env.R2_ACCOUNT_ID?.trim();
18
+ const bucket = env.R2_BUCKET_NAME?.trim();
19
+ const accessKeyId = env.R2_ACCESS_KEY_ID?.trim();
20
+ const secretAccessKey = env.R2_SECRET_ACCESS_KEY?.trim();
21
+ const missing = [
22
+ !accountId && 'R2_ACCOUNT_ID',
23
+ !bucket && 'R2_BUCKET_NAME',
24
+ !accessKeyId && 'R2_ACCESS_KEY_ID',
25
+ !secretAccessKey && 'R2_SECRET_ACCESS_KEY',
26
+ ].filter(Boolean);
27
+ if (missing.length > 0) {
28
+ throw new Error(`Sessions sync: bundle '${SYNC_BUNDLE}' is missing ${missing.join(', ')}. ` +
29
+ `Add them with: agents secrets add ${SYNC_BUNDLE} <KEY>`);
30
+ }
31
+ return {
32
+ accountId: accountId,
33
+ bucket: bucket,
34
+ accessKeyId: accessKeyId,
35
+ secretAccessKey: secretAccessKey,
36
+ endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
37
+ };
38
+ }
39
+ /** True when the sync bundle exists and looks resolvable, without throwing. */
40
+ export function isSyncConfigured() {
41
+ try {
42
+ loadR2Config();
43
+ return true;
44
+ }
45
+ catch {
46
+ return false;
47
+ }
48
+ }
49
+ /**
50
+ * This machine's stable, human-readable id, used as its R2 prefix and mirror
51
+ * directory name. Tailnet hostnames (zion, yosemite-s0, mac-mini) are already
52
+ * unique and readable; we lowercase and strip any domain suffix. Overridable
53
+ * via AGENTS_SYNC_MACHINE_ID for tests and unusual setups.
54
+ */
55
+ export function machineId() {
56
+ const raw = process.env.AGENTS_SYNC_MACHINE_ID || os.hostname();
57
+ return raw.split('.')[0].trim().toLowerCase().replace(/[^a-z0-9_-]/g, '-') || 'unknown';
58
+ }
@@ -0,0 +1,44 @@
1
+ /**
2
+ * CRDT merge for agent transcripts.
3
+ *
4
+ * A transcript (Claude JSONL, Codex JSONL, …) is an append-only log of
5
+ * immutable events: each line is written once and never rewritten, and Claude
6
+ * already tolerates branches within one file (parentUuid fan-out). That makes a
7
+ * transcript a grow-only set (G-Set) of events, and merging two copies of the
8
+ * same session is a set union — associative, commutative, idempotent. Two
9
+ * machines that each appended to the same session therefore converge to the
10
+ * exact same merged file regardless of sync order or timing, with zero conflict
11
+ * resolution and zero data loss.
12
+ *
13
+ * Events are identified by the SHA-256 of their raw line bytes. We deliberately
14
+ * do NOT key on a per-event `uuid`: Codex lines carry no id, and because an
15
+ * event is written exactly once and then copied verbatim across machines, the
16
+ * raw bytes are a stable, agent-agnostic identity. Multiplicity is preserved
17
+ * (some transcripts contain legitimately identical lines, e.g. paired
18
+ * `queue-operation` entries) by taking the per-hash max count across sources.
19
+ */
20
+ export interface ParsedEvent {
21
+ /** Original line bytes, exactly as stored (no trailing newline). */
22
+ raw: string;
23
+ /** SHA-256 of `raw` — the event's identity. */
24
+ hash: string;
25
+ /** Top-level ISO `timestamp`, or '' when absent/unparseable. */
26
+ ts: string;
27
+ }
28
+ /** Parse a transcript's raw text into events, skipping blank lines. */
29
+ export declare function parseTranscript(content: string): ParsedEvent[];
30
+ /**
31
+ * Merge copies of the same session into one transcript via G-Set union.
32
+ *
33
+ * Returns a source VERBATIM (no reordering, byte-identical) for the common
34
+ * cases — one source, all sources identical, or one source a superset of the
35
+ * rest — so the steady state never rewrites unchanged files. Only a true fork
36
+ * (each side holds events the other lacks) produces a reordered union, sorted
37
+ * by (timestamp, hash) so every machine derives identical bytes.
38
+ */
39
+ export declare function mergeTranscripts(contents: string[]): string;
40
+ /** Count distinct + total events across copies (for logging / manifest stats). */
41
+ export declare function transcriptStats(content: string): {
42
+ events: number;
43
+ lastTs: string;
44
+ };