@pleri/olam-cli 0.1.153 → 0.1.158
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/commands/bootstrap.d.ts +2 -1
- package/dist/commands/bootstrap.d.ts.map +1 -1
- package/dist/commands/bootstrap.js +8 -10
- package/dist/commands/bootstrap.js.map +1 -1
- package/dist/commands/doctor.d.ts +22 -0
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +110 -7
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/flywheel/check-persona-skeleton.d.ts +7 -0
- package/dist/commands/flywheel/check-persona-skeleton.d.ts.map +1 -0
- package/dist/commands/flywheel/check-persona-skeleton.js +14 -0
- package/dist/commands/flywheel/check-persona-skeleton.js.map +1 -0
- package/dist/commands/flywheel/diversity-check.d.ts +7 -0
- package/dist/commands/flywheel/diversity-check.d.ts.map +1 -0
- package/dist/commands/flywheel/diversity-check.js +14 -0
- package/dist/commands/flywheel/diversity-check.js.map +1 -0
- package/dist/commands/flywheel/emit-breadcrumb.d.ts +20 -0
- package/dist/commands/flywheel/emit-breadcrumb.d.ts.map +1 -0
- package/dist/commands/flywheel/emit-breadcrumb.js +137 -0
- package/dist/commands/flywheel/emit-breadcrumb.js.map +1 -0
- package/dist/commands/flywheel/index.d.ts +27 -0
- package/dist/commands/flywheel/index.d.ts.map +1 -0
- package/dist/commands/flywheel/index.js +48 -0
- package/dist/commands/flywheel/index.js.map +1 -0
- package/dist/commands/flywheel/install-shims.d.ts +8 -0
- package/dist/commands/flywheel/install-shims.d.ts.map +1 -0
- package/dist/commands/flywheel/install-shims.js +15 -0
- package/dist/commands/flywheel/install-shims.js.map +1 -0
- package/dist/commands/flywheel/k10-measure.d.ts +7 -0
- package/dist/commands/flywheel/k10-measure.d.ts.map +1 -0
- package/dist/commands/flywheel/k10-measure.js +14 -0
- package/dist/commands/flywheel/k10-measure.js.map +1 -0
- package/dist/commands/flywheel/k5-score.d.ts +14 -0
- package/dist/commands/flywheel/k5-score.d.ts.map +1 -0
- package/dist/commands/flywheel/k5-score.js +59 -0
- package/dist/commands/flywheel/k5-score.js.map +1 -0
- package/dist/commands/flywheel/k5-validate.d.ts +15 -0
- package/dist/commands/flywheel/k5-validate.d.ts.map +1 -0
- package/dist/commands/flywheel/k5-validate.js +185 -0
- package/dist/commands/flywheel/k5-validate.js.map +1 -0
- package/dist/commands/flywheel/ping.d.ts +21 -0
- package/dist/commands/flywheel/ping.d.ts.map +1 -0
- package/dist/commands/flywheel/ping.js +79 -0
- package/dist/commands/flywheel/ping.js.map +1 -0
- package/dist/commands/flywheel/sanitize-persona-output.d.ts +7 -0
- package/dist/commands/flywheel/sanitize-persona-output.d.ts.map +1 -0
- package/dist/commands/flywheel/sanitize-persona-output.js +14 -0
- package/dist/commands/flywheel/sanitize-persona-output.js.map +1 -0
- package/dist/commands/hermes-kg-hook.d.ts +36 -0
- package/dist/commands/hermes-kg-hook.d.ts.map +1 -0
- package/dist/commands/hermes-kg-hook.js +80 -0
- package/dist/commands/hermes-kg-hook.js.map +1 -0
- package/dist/commands/hermes.d.ts +46 -0
- package/dist/commands/hermes.d.ts.map +1 -0
- package/dist/commands/hermes.js +320 -0
- package/dist/commands/hermes.js.map +1 -0
- package/dist/commands/kg-install-hook.d.ts +7 -1
- package/dist/commands/kg-install-hook.d.ts.map +1 -1
- package/dist/commands/kg-install-hook.js +122 -6
- package/dist/commands/kg-install-hook.js.map +1 -1
- package/dist/commands/memory/_paths.d.ts +13 -3
- package/dist/commands/memory/_paths.d.ts.map +1 -1
- package/dist/commands/memory/_paths.js +25 -22
- package/dist/commands/memory/_paths.js.map +1 -1
- package/dist/commands/memory/logs.d.ts +8 -4
- package/dist/commands/memory/logs.d.ts.map +1 -1
- package/dist/commands/memory/logs.js +18 -13
- package/dist/commands/memory/logs.js.map +1 -1
- package/dist/commands/memory/mode.d.ts.map +1 -1
- package/dist/commands/memory/mode.js +7 -3
- package/dist/commands/memory/mode.js.map +1 -1
- package/dist/commands/memory/start.d.ts +16 -14
- package/dist/commands/memory/start.d.ts.map +1 -1
- package/dist/commands/memory/start.js +55 -189
- package/dist/commands/memory/start.js.map +1 -1
- package/dist/commands/memory/status.d.ts +10 -8
- package/dist/commands/memory/status.d.ts.map +1 -1
- package/dist/commands/memory/status.js +35 -38
- package/dist/commands/memory/status.js.map +1 -1
- package/dist/commands/memory/stop.d.ts +5 -4
- package/dist/commands/memory/stop.d.ts.map +1 -1
- package/dist/commands/memory/stop.js +26 -55
- package/dist/commands/memory/stop.js.map +1 -1
- package/dist/commands/memory-service-container.d.ts +78 -0
- package/dist/commands/memory-service-container.d.ts.map +1 -0
- package/dist/commands/memory-service-container.js +187 -0
- package/dist/commands/memory-service-container.js.map +1 -0
- package/dist/commands/services.d.ts +16 -1
- package/dist/commands/services.d.ts.map +1 -1
- package/dist/commands/services.js +88 -12
- package/dist/commands/services.js.map +1 -1
- package/dist/image-digests.json +7 -7
- package/dist/index.js +2570 -1384
- package/dist/index.js.map +1 -1
- package/dist/lib/k8s-secret-render.d.ts.map +1 -1
- package/dist/lib/k8s-secret-render.js +7 -4
- package/dist/lib/k8s-secret-render.js.map +1 -1
- package/dist/lib/memory-host-process-migration.d.ts +56 -0
- package/dist/lib/memory-host-process-migration.d.ts.map +1 -0
- package/dist/lib/memory-host-process-migration.js +156 -0
- package/dist/lib/memory-host-process-migration.js.map +1 -0
- package/dist/lib/upgrade-kubernetes.d.ts +22 -0
- package/dist/lib/upgrade-kubernetes.d.ts.map +1 -1
- package/dist/lib/upgrade-kubernetes.js +195 -2
- package/dist/lib/upgrade-kubernetes.js.map +1 -1
- package/dist/mcp-server.js +56 -22
- package/hermes-bundle/kg-first.sh +100 -0
- package/hermes-bundle/version.json +4 -0
- package/host-cp/k8s/manifests/50-deployment.yaml +54 -27
- package/host-cp/k8s/manifests/auth-service/30-configmap.yaml +5 -0
- package/host-cp/k8s/manifests/auth-service/50-deployment.yaml +5 -1
- package/host-cp/k8s/manifests/kg-service/30-configmap.yaml +5 -0
- package/host-cp/k8s/manifests/kg-service/50-deployment.yaml +5 -1
- package/host-cp/k8s/manifests/mcp-auth-service/30-configmap.yaml +4 -0
- package/host-cp/k8s/manifests/mcp-auth-service/50-deployment.yaml +5 -1
- package/host-cp/k8s/manifests/memory-service/30-configmap.yaml +4 -0
- package/host-cp/k8s/manifests/memory-service/50-deployment.yaml +5 -1
- package/host-cp/src/metrics.mjs +281 -0
- package/host-cp/src/server.mjs +22 -2
- package/package.json +3 -4
- package/memory-service-bundle/scripts/ensure-iii-engine.mjs +0 -179
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kg-install-hook.d.ts","sourceRoot":"","sources":["../../src/commands/kg-install-hook.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"kg-install-hook.d.ts","sourceRoot":"","sources":["../../src/commands/kg-install-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuKzC,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAmE9D"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* `olam kg install-hook [--scope project|user]
|
|
2
|
+
* `olam kg install-hook [--scope project|user] [--for claude|hermes]`
|
|
3
|
+
*
|
|
4
|
+
* Default (--for claude, --scope project): wire the kg-service PreToolUse
|
|
3
5
|
* hook into .claude/settings.json.
|
|
4
6
|
*
|
|
7
|
+
* --for hermes: install kg-first.sh into ~/.hermes/hooks/ and patch
|
|
8
|
+
* ~/.hermes/config.yaml hooks.pre_tool_call. Refuses if
|
|
9
|
+
* ~/.hermes/config.yaml doesn't exist.
|
|
10
|
+
*
|
|
5
11
|
* Default scope=project writes to `<cwd>/.claude/settings.json`. Per-repo
|
|
6
12
|
* opt-in keeps blast radius small (operator can try it on one repo before
|
|
7
13
|
* promoting to --scope user which targets `~/.claude/settings.json`).
|
|
@@ -12,9 +18,11 @@
|
|
|
12
18
|
import * as fs from 'node:fs';
|
|
13
19
|
import * as path from 'node:path';
|
|
14
20
|
import * as os from 'node:os';
|
|
21
|
+
import { parse as yamlParse, stringify as yamlStringify } from 'yaml';
|
|
15
22
|
import { mergeHomeSettingsJson } from '@olam/core/src/world/merge-settings.js';
|
|
16
23
|
import { buildHookMatcherEntry, KG_HOOK_SENTINEL, } from '@olam/core/src/kg/hook-template.js';
|
|
17
24
|
import { printError, printInfo, printSuccess, printWarning } from '../output.js';
|
|
25
|
+
import { installKgFirstHookForHermes, HERMES_KG_HOOK_SENTINEL, } from './hermes-kg-hook.js';
|
|
18
26
|
function settingsPathFor(scope) {
|
|
19
27
|
if (scope === 'user') {
|
|
20
28
|
return path.join(os.homedir(), '.claude', 'settings.json');
|
|
@@ -29,14 +37,125 @@ function backup(filePath) {
|
|
|
29
37
|
fs.copyFileSync(filePath, backupPath);
|
|
30
38
|
return backupPath;
|
|
31
39
|
}
|
|
40
|
+
const HERMES_HOOK_MATCHERS = ['terminal', 'bash', 'shell', 'search_files', 'grep', 'ripgrep'];
|
|
41
|
+
function hermesConfigPath() {
|
|
42
|
+
return path.join(os.homedir(), '.hermes', 'config.yaml');
|
|
43
|
+
}
|
|
44
|
+
function hermesHooksDir() {
|
|
45
|
+
return path.join(os.homedir(), '.hermes', 'hooks');
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Patch ~/.hermes/config.yaml to add / remove the pre_tool_call entry.
|
|
49
|
+
* Idempotent: checks for HERMES_KG_HOOK_SENTINEL before writing.
|
|
50
|
+
*/
|
|
51
|
+
function patchHermesConfigForHook(action) {
|
|
52
|
+
const configPath = hermesConfigPath();
|
|
53
|
+
const raw = fs.readFileSync(configPath, 'utf-8');
|
|
54
|
+
const config = yamlParse(raw);
|
|
55
|
+
const hooks = (config['hooks'] ?? {});
|
|
56
|
+
const preToolCall = Array.isArray(hooks['pre_tool_call'])
|
|
57
|
+
? hooks['pre_tool_call']
|
|
58
|
+
: [];
|
|
59
|
+
if (action === 'install') {
|
|
60
|
+
const alreadyPresent = preToolCall.some((e) => typeof e['command'] === 'string' && e['command'].includes(HERMES_KG_HOOK_SENTINEL));
|
|
61
|
+
if (alreadyPresent)
|
|
62
|
+
return 'already-present';
|
|
63
|
+
const hookScriptPath = path.join(hermesHooksDir(), 'kg-first.sh');
|
|
64
|
+
const entry = {
|
|
65
|
+
matcher: HERMES_HOOK_MATCHERS.join('|'),
|
|
66
|
+
command: `${hookScriptPath} # ${HERMES_KG_HOOK_SENTINEL}`,
|
|
67
|
+
};
|
|
68
|
+
const updated = {
|
|
69
|
+
...config,
|
|
70
|
+
hooks: { ...hooks, pre_tool_call: [...preToolCall, entry] },
|
|
71
|
+
hooks_auto_accept: true,
|
|
72
|
+
};
|
|
73
|
+
fs.writeFileSync(configPath, yamlStringify(updated), 'utf-8');
|
|
74
|
+
return 'patched';
|
|
75
|
+
}
|
|
76
|
+
// uninstall
|
|
77
|
+
const filtered = preToolCall.filter((e) => !(typeof e['command'] === 'string' && e['command'].includes(HERMES_KG_HOOK_SENTINEL)));
|
|
78
|
+
if (filtered.length === preToolCall.length)
|
|
79
|
+
return 'already-absent';
|
|
80
|
+
const updated = {
|
|
81
|
+
...config,
|
|
82
|
+
hooks: { ...hooks, pre_tool_call: filtered },
|
|
83
|
+
};
|
|
84
|
+
fs.writeFileSync(configPath, yamlStringify(updated), 'utf-8');
|
|
85
|
+
return 'patched';
|
|
86
|
+
}
|
|
87
|
+
// ── Action: install for Hermes ────────────────────────────────────────────────
|
|
88
|
+
function doInstallForHermes() {
|
|
89
|
+
const configPath = hermesConfigPath();
|
|
90
|
+
if (!fs.existsSync(configPath)) {
|
|
91
|
+
printError(`~/.hermes/config.yaml not found at ${configPath}`);
|
|
92
|
+
printInfo('remedy', 'Install Hermes first, then re-run `olam kg install-hook --for hermes`');
|
|
93
|
+
process.exitCode = 1;
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
const hooksDir = hermesHooksDir();
|
|
97
|
+
const hookResult = installKgFirstHookForHermes(hooksDir, /* dryRun */ false);
|
|
98
|
+
const configResult = patchHermesConfigForHook('install');
|
|
99
|
+
if (hookResult.status === 'already-present' && configResult === 'already-present') {
|
|
100
|
+
printInfo('kg-first hook', `already installed for Hermes`);
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
if (hookResult.status === 'installed') {
|
|
104
|
+
printSuccess(`kg-first.sh installed → ${hookResult.destPath}`);
|
|
105
|
+
}
|
|
106
|
+
if (configResult === 'patched') {
|
|
107
|
+
printSuccess(`${configPath} patched — hooks.pre_tool_call entry added`);
|
|
108
|
+
}
|
|
109
|
+
printInfo('next', 'hermes gateway restart');
|
|
110
|
+
}
|
|
111
|
+
// ── Action: uninstall for Hermes ──────────────────────────────────────────────
|
|
112
|
+
function doUninstallForHermes() {
|
|
113
|
+
const configPath = hermesConfigPath();
|
|
114
|
+
const hooksDir = hermesHooksDir();
|
|
115
|
+
const hookScriptPath = path.join(hooksDir, 'kg-first.sh');
|
|
116
|
+
let scriptRemoved = false;
|
|
117
|
+
if (fs.existsSync(hookScriptPath)) {
|
|
118
|
+
const content = fs.readFileSync(hookScriptPath, 'utf-8');
|
|
119
|
+
if (content.includes(HERMES_KG_HOOK_SENTINEL)) {
|
|
120
|
+
fs.unlinkSync(hookScriptPath);
|
|
121
|
+
scriptRemoved = true;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
let configPatched = false;
|
|
125
|
+
if (fs.existsSync(configPath)) {
|
|
126
|
+
const result = patchHermesConfigForHook('uninstall');
|
|
127
|
+
configPatched = result === 'patched';
|
|
128
|
+
}
|
|
129
|
+
if (!scriptRemoved && !configPatched) {
|
|
130
|
+
printInfo('kg-first hook', 'not installed for Hermes — nothing to remove');
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
if (scriptRemoved)
|
|
134
|
+
printSuccess(`kg-first.sh removed from ${hooksDir}`);
|
|
135
|
+
if (configPatched)
|
|
136
|
+
printSuccess(`${configPath} patched — pre_tool_call entry removed`);
|
|
137
|
+
}
|
|
138
|
+
// ── Command registration ──────────────────────────────────────────────────────
|
|
32
139
|
export function registerKgInstallHookCommand(kg) {
|
|
33
140
|
kg.command('install-hook')
|
|
34
|
-
.description('Install kg-service
|
|
141
|
+
.description('Install kg-service hook (idempotent). --for hermes targets ~/.hermes/; default targets .claude/settings.json')
|
|
35
142
|
.option('--scope <scope>', 'project (default; <cwd>/.claude/settings.json) or user (~/.claude/settings.json)', 'project')
|
|
143
|
+
.option('--for <target>', 'Target agent: claude (default) or hermes', 'claude')
|
|
144
|
+
.option('--uninstall', 'Uninstall instead of install')
|
|
36
145
|
.action((opts) => {
|
|
146
|
+
const target = opts.for === 'hermes' ? 'hermes' : 'claude';
|
|
147
|
+
if (target === 'hermes') {
|
|
148
|
+
if (opts.uninstall) {
|
|
149
|
+
doUninstallForHermes();
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
doInstallForHermes();
|
|
153
|
+
}
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
// ── Claude target (original behaviour) ──────────────────────────────
|
|
37
157
|
const scope = opts.scope === 'user' ? 'user' : 'project';
|
|
38
158
|
const filePath = settingsPathFor(scope);
|
|
39
|
-
// Ensure parent .claude/ dir exists (settings.json may not yet be present).
|
|
40
159
|
try {
|
|
41
160
|
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
42
161
|
}
|
|
@@ -45,7 +164,6 @@ export function registerKgInstallHookCommand(kg) {
|
|
|
45
164
|
process.exitCode = 1;
|
|
46
165
|
return;
|
|
47
166
|
}
|
|
48
|
-
// Back up any existing settings.json before mutation.
|
|
49
167
|
const backupPath = backup(filePath);
|
|
50
168
|
try {
|
|
51
169
|
const result = mergeHomeSettingsJson(filePath, {
|
|
@@ -65,7 +183,6 @@ export function registerKgInstallHookCommand(kg) {
|
|
|
65
183
|
return;
|
|
66
184
|
case 'already-present':
|
|
67
185
|
printInfo('kg-service hook', `already installed at ${filePath}`);
|
|
68
|
-
// Backup was unnecessary; clean up to avoid backup-file proliferation.
|
|
69
186
|
if (backupPath) {
|
|
70
187
|
try {
|
|
71
188
|
fs.unlinkSync(backupPath);
|
|
@@ -76,7 +193,6 @@ export function registerKgInstallHookCommand(kg) {
|
|
|
76
193
|
}
|
|
77
194
|
return;
|
|
78
195
|
case 'no-op':
|
|
79
|
-
// mergeHomeSettingsJson returns no-op when there's no patch — shouldn't happen with ensureHook
|
|
80
196
|
printWarning(`no change made to ${filePath}`);
|
|
81
197
|
return;
|
|
82
198
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kg-install-hook.js","sourceRoot":"","sources":["../../src/commands/kg-install-hook.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"kg-install-hook.js","sourceRoot":"","sources":["../../src/commands/kg-install-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EACL,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAY7B,SAAS,eAAe,CAAC,KAAY;IACnC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,MAAM,CAAC,QAAgB;IAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,QAAQ,aAAa,EAAE,EAAE,CAAC;IAChD,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC;AACpB,CAAC;AAMD,MAAM,oBAAoB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAE9F,SAAS,gBAAgB;IACvB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,cAAc;IACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC;AAED;;;GAGG;AACH,SAAS,wBAAwB,CAC/B,MAA+B;IAE/B,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAiB,CAAC;IAC9C,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAA4B,CAAC;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACvD,CAAC,CAAE,KAAK,CAAC,eAAe,CAAoC;QAC5D,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAC1F,CAAC;QACF,IAAI,cAAc;YAAE,OAAO,iBAAiB,CAAC;QAE7C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,aAAa,CAAC,CAAC;QAClE,MAAM,KAAK,GAA4B;YACrC,OAAO,EAAE,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC;YACvC,OAAO,EAAE,GAAG,cAAc,MAAM,uBAAuB,EAAE;SAC1D,CAAC;QACF,MAAM,OAAO,GAAiB;YAC5B,GAAG,MAAM;YACT,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,aAAa,EAAE,CAAC,GAAG,WAAW,EAAE,KAAK,CAAC,EAAE;YAC3D,iBAAiB,EAAE,IAAI;SACxB,CAAC;QACF,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,YAAY;IACZ,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAC7F,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM;QAAE,OAAO,gBAAgB,CAAC;IAEpE,MAAM,OAAO,GAAiB;QAC5B,GAAG,MAAM;QACT,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE;KAC7C,CAAC;IACF,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,iFAAiF;AAEjF,SAAS,kBAAkB;IACzB,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,UAAU,CAAC,sCAAsC,UAAU,EAAE,CAAC,CAAC;QAC/D,SAAS,CAAC,QAAQ,EAAE,uEAAuE,CAAC,CAAC;QAC7F,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,2BAA2B,CAAC,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IAC7E,MAAM,YAAY,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAEzD,IAAI,UAAU,CAAC,MAAM,KAAK,iBAAiB,IAAI,YAAY,KAAK,iBAAiB,EAAE,CAAC;QAClF,SAAS,CAAC,eAAe,EAAE,8BAA8B,CAAC,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QACtC,YAAY,CAAC,2BAA2B,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,YAAY,CAAC,GAAG,UAAU,4CAA4C,CAAC,CAAC;IAC1E,CAAC;IACD,SAAS,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAC9C,CAAC;AAED,iFAAiF;AAEjF,SAAS,oBAAoB;IAC3B,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IAEtC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE1D,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACzD,IAAI,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAC9C,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAC9B,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IAED,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;QACrD,aAAa,GAAG,MAAM,KAAK,SAAS,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,EAAE,CAAC;QACrC,SAAS,CAAC,eAAe,EAAE,8CAA8C,CAAC,CAAC;QAC3E,OAAO;IACT,CAAC;IAED,IAAI,aAAa;QAAE,YAAY,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;IACxE,IAAI,aAAa;QAAE,YAAY,CAAC,GAAG,UAAU,wCAAwC,CAAC,CAAC;AACzF,CAAC;AAED,iFAAiF;AAEjF,MAAM,UAAU,4BAA4B,CAAC,EAAW;IACtD,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,8GAA8G,CAAC;SAC3H,MAAM,CAAC,iBAAiB,EAAE,kFAAkF,EAAE,SAAS,CAAC;SACxH,MAAM,CAAC,gBAAgB,EAAE,0CAA0C,EAAE,QAAQ,CAAC;SAC9E,MAAM,CAAC,aAAa,EAAE,8BAA8B,CAAC;SACrD,MAAM,CAAC,CAAC,IAAwB,EAAE,EAAE;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAE3D,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,oBAAoB,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,kBAAkB,EAAE,CAAC;YACvB,CAAC;YACD,OAAO;QACT,CAAC;QAED,uEAAuE;QACvE,MAAM,KAAK,GAAU,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAChE,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,CAAC;YACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,CAAC,oBAAoB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9G,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEpC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,qBAAqB,CAAC,QAAQ,EAAE;gBAC7C,UAAU,EAAE;oBACV,KAAK,EAAE,YAAY;oBACnB,QAAQ,EAAE,gBAAgB;oBAC1B,KAAK,EAAE,qBAAqB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;iBACjD;aACF,CAAC,CAAC;YACH,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;gBACtB,KAAK,WAAW;oBACd,YAAY,CAAC,8BAA8B,KAAK,SAAS,CAAC,CAAC;oBAC3D,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;oBAChC,IAAI,UAAU;wBAAE,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;oBAChD,SAAS,CAAC,MAAM,EAAE,0GAA0G,CAAC,CAAC;oBAC9H,OAAO;gBACT,KAAK,iBAAiB;oBACpB,SAAS,CAAC,iBAAiB,EAAE,wBAAwB,QAAQ,EAAE,CAAC,CAAC;oBACjE,IAAI,UAAU,EAAE,CAAC;wBACf,IAAI,CAAC;4BACH,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;wBAC5B,CAAC;wBAAC,MAAM,CAAC;4BACP,cAAc;wBAChB,CAAC;oBACH,CAAC;oBACD,OAAO;gBACT,KAAK,OAAO;oBACV,YAAY,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;oBAC9C,OAAO;YACX,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,CAAC,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvF,IAAI,UAAU;gBAAE,SAAS,CAAC,QAAQ,EAAE,8BAA8B,UAAU,EAAE,CAAC,CAAC;YAChF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Shared file-path + URL constants for `olam memory` subcommands.
|
|
3
|
-
*
|
|
3
|
+
*
|
|
4
|
+
* memory-service-as-docker-peripheral Phase C C4 dropped `OLAM_BIN_DIR` and
|
|
5
|
+
* `III_BINARY_PATH` (no consumers after Phase B replaced the host-process
|
|
6
|
+
* substrate with `MemoryServiceContainerController`). `MEMORY_PID_PATH` +
|
|
7
|
+
* `MEMORY_LOG_PATH` are retained for the legacy-state migration helper —
|
|
8
|
+
* upgraders from the pre-Phase-B substrate still need cleanup of these
|
|
9
|
+
* artefacts on first new-substrate `olam memory start`.
|
|
10
|
+
*
|
|
11
|
+
* `MEMORY_SERVICE_CANDIDATES` is retained for `bridge.ts` (a separate
|
|
12
|
+
* Cloudflare-bridging subcommand that resolves `packages/memory-service/`
|
|
13
|
+
* for its `local-bridge-server.mjs`). Phase C also dropped the
|
|
14
|
+
* `memory-service-bundle/` candidate — that bundle no longer ships in the
|
|
15
|
+
* @pleri/olam-cli tarball.
|
|
4
16
|
*/
|
|
5
17
|
export declare const OLAM_HOME: string;
|
|
6
|
-
export declare const OLAM_BIN_DIR: string;
|
|
7
|
-
export declare const III_BINARY_PATH: string;
|
|
8
18
|
export declare const MEMORY_PID_PATH: string;
|
|
9
19
|
export declare const MEMORY_LOG_PATH: string;
|
|
10
20
|
export declare const MEMORY_DATA_DIR: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_paths.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/_paths.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"_paths.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/_paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAMH,eAAO,MAAM,SAAS,QAA2B,CAAC;AAClD,eAAO,MAAM,eAAe,QAAgC,CAAC;AAC7D,eAAO,MAAM,eAAe,QAAwC,CAAC;AACrE,eAAO,MAAM,eAAe,QAAiC,CAAC;AAE9D,mDAAmD;AACnD,eAAO,MAAM,gBAAgB,OAAO,CAAC;AACrC,eAAO,MAAM,gBAAgB,4CAA2D,CAAC;AAgCzF,eAAO,MAAM,yBAAyB,UAAa,CAAC"}
|
|
@@ -1,13 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Shared file-path + URL constants for `olam memory` subcommands.
|
|
3
|
-
*
|
|
3
|
+
*
|
|
4
|
+
* memory-service-as-docker-peripheral Phase C C4 dropped `OLAM_BIN_DIR` and
|
|
5
|
+
* `III_BINARY_PATH` (no consumers after Phase B replaced the host-process
|
|
6
|
+
* substrate with `MemoryServiceContainerController`). `MEMORY_PID_PATH` +
|
|
7
|
+
* `MEMORY_LOG_PATH` are retained for the legacy-state migration helper —
|
|
8
|
+
* upgraders from the pre-Phase-B substrate still need cleanup of these
|
|
9
|
+
* artefacts on first new-substrate `olam memory start`.
|
|
10
|
+
*
|
|
11
|
+
* `MEMORY_SERVICE_CANDIDATES` is retained for `bridge.ts` (a separate
|
|
12
|
+
* Cloudflare-bridging subcommand that resolves `packages/memory-service/`
|
|
13
|
+
* for its `local-bridge-server.mjs`). Phase C also dropped the
|
|
14
|
+
* `memory-service-bundle/` candidate — that bundle no longer ships in the
|
|
15
|
+
* @pleri/olam-cli tarball.
|
|
4
16
|
*/
|
|
5
17
|
import { homedir } from 'node:os';
|
|
6
18
|
import { join, dirname } from 'node:path';
|
|
7
19
|
import { fileURLToPath } from 'node:url';
|
|
8
20
|
export const OLAM_HOME = join(homedir(), '.olam');
|
|
9
|
-
export const OLAM_BIN_DIR = join(OLAM_HOME, 'bin');
|
|
10
|
-
export const III_BINARY_PATH = join(OLAM_BIN_DIR, 'iii');
|
|
11
21
|
export const MEMORY_PID_PATH = join(OLAM_HOME, 'memory.pid');
|
|
12
22
|
export const MEMORY_LOG_PATH = join(OLAM_HOME, 'memory-service.log');
|
|
13
23
|
export const MEMORY_DATA_DIR = join(OLAM_HOME, 'memory-data');
|
|
@@ -15,38 +25,31 @@ export const MEMORY_DATA_DIR = join(OLAM_HOME, 'memory-data');
|
|
|
15
25
|
export const MEMORY_REST_PORT = 3111;
|
|
16
26
|
export const MEMORY_LIVEZ_URL = `http://localhost:${MEMORY_REST_PORT}/agentmemory/livez`;
|
|
17
27
|
/**
|
|
18
|
-
* Resolve packages/memory-service/ from the CLI source
|
|
28
|
+
* Resolve packages/memory-service/ from the CLI source location.
|
|
19
29
|
*
|
|
20
|
-
*
|
|
30
|
+
* Two layouts (Phase C removed the bundled-CLI candidate):
|
|
21
31
|
*
|
|
22
32
|
* 1. **Workspace dev (built)** — `packages/cli/dist/commands/memory/_paths.js`
|
|
23
33
|
* runs in the monorepo. Sibling: `packages/memory-service/`.
|
|
24
34
|
*
|
|
25
|
-
* 2. **
|
|
26
|
-
*
|
|
27
|
-
* In a published @pleri/olam-cli tarball: sibling `memory-service-bundle/`
|
|
28
|
-
* (a stripped-down copy containing just scripts/ensure-iii-engine.mjs;
|
|
29
|
-
* see bundle-cli.mjs for the copy step).
|
|
35
|
+
* 2. **Workspace bundled** — `packages/cli/dist/index.js` is the esbuild
|
|
36
|
+
* bundle (workspace dev path). Sibling: `packages/memory-service/`.
|
|
30
37
|
*
|
|
31
|
-
* 3. **CWD fallback** — operator runs
|
|
32
|
-
*
|
|
38
|
+
* 3. **CWD fallback** — operator runs from a repo checkout;
|
|
39
|
+
* `./packages/memory-service` exists.
|
|
33
40
|
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
* `
|
|
41
|
+
* In a published @pleri/olam-cli tarball, `packages/memory-service/` does
|
|
42
|
+
* NOT ship — operators consume memory-service via the
|
|
43
|
+
* `ghcr.io/pleri/olam-memory-service:latest` Docker image instead. `bridge.ts`
|
|
44
|
+
* is the only remaining consumer of this list; it requires the operator to
|
|
45
|
+
* run from a checkout when invoking `olam memory bridge serve --local`.
|
|
39
46
|
*/
|
|
40
47
|
const here = dirname(fileURLToPath(import.meta.url));
|
|
41
48
|
const candidates = [
|
|
42
49
|
// 1. Workspace dev (built): packages/cli/dist/commands/memory/_paths.js → packages/cli → packages/memory-service
|
|
43
50
|
join(here, '..', '..', '..', '..', 'memory-service'),
|
|
44
|
-
//
|
|
51
|
+
// 2. Workspace bundled: packages/cli/dist/index.js → packages/cli → packages/memory-service
|
|
45
52
|
join(here, '..', '..', 'memory-service'),
|
|
46
|
-
// 2b. Published tarball: <prefix>/node_modules/@pleri/olam-cli/dist/index.js
|
|
47
|
-
// → <prefix>/node_modules/@pleri/olam-cli/memory-service-bundle
|
|
48
|
-
// (copied at publish time by bundle-cli.mjs)
|
|
49
|
-
join(here, '..', 'memory-service-bundle'),
|
|
50
53
|
// 3. CWD fallback
|
|
51
54
|
join(process.cwd(), 'packages', 'memory-service'),
|
|
52
55
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_paths.js","sourceRoot":"","sources":["../../../src/commands/memory/_paths.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"_paths.js","sourceRoot":"","sources":["../../../src/commands/memory/_paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAE9D,mDAAmD;AACnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAG,oBAAoB,gBAAgB,oBAAoB,CAAC;AAEzF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACrD,MAAM,UAAU,GAAG;IACjB,iHAAiH;IACjH,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC;IACpD,4FAA4F;IAC5F,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC;IACxC,kBAAkB;IAClB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC;CAClD,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,UAAU,CAAC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* olam memory logs —
|
|
2
|
+
* olam memory logs — stream the agent-memory Docker container's stdout/stderr.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* Phase B substrate: shells to `docker logs olam-memory-service`. The Phase A
|
|
5
|
+
* file-tail path (`tail -f ~/.olam/memory-service.log`) is retired because the
|
|
6
|
+
* log file no longer exists once the container substrate is in place.
|
|
6
7
|
*
|
|
7
|
-
*
|
|
8
|
+
* --follow (alias -f): docker logs --follow (Ctrl-C to stop).
|
|
9
|
+
* --tail N (default 50): docker logs --tail N.
|
|
10
|
+
*
|
|
11
|
+
* Plan reference: docs/plans/memory-service-as-docker-peripheral/phase-b-tasks.md B4
|
|
8
12
|
*/
|
|
9
13
|
import type { Command } from 'commander';
|
|
10
14
|
export declare function runMemoryLogs(opts: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/logs.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/logs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,wBAAsB,aAAa,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAyB9F;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAUrD"}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* olam memory logs —
|
|
2
|
+
* olam memory logs — stream the agent-memory Docker container's stdout/stderr.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* Phase B substrate: shells to `docker logs olam-memory-service`. The Phase A
|
|
5
|
+
* file-tail path (`tail -f ~/.olam/memory-service.log`) is retired because the
|
|
6
|
+
* log file no longer exists once the container substrate is in place.
|
|
6
7
|
*
|
|
7
|
-
*
|
|
8
|
+
* --follow (alias -f): docker logs --follow (Ctrl-C to stop).
|
|
9
|
+
* --tail N (default 50): docker logs --tail N.
|
|
10
|
+
*
|
|
11
|
+
* Plan reference: docs/plans/memory-service-as-docker-peripheral/phase-b-tasks.md B4
|
|
8
12
|
*/
|
|
9
|
-
import { existsSync } from 'node:fs';
|
|
10
13
|
import { spawn } from 'node:child_process';
|
|
11
14
|
import { printWarning, printHeader } from '../../output.js';
|
|
12
|
-
import {
|
|
15
|
+
import { MEMORY_SERVICE_CONTAINER, MemoryServiceContainerController } from '../memory-service-container.js';
|
|
13
16
|
export async function runMemoryLogs(opts) {
|
|
14
|
-
|
|
15
|
-
|
|
17
|
+
const controller = new MemoryServiceContainerController();
|
|
18
|
+
const status = controller.status();
|
|
19
|
+
if (status.state === 'missing') {
|
|
20
|
+
printWarning(`no olam-memory-service container exists. Start it via 'olam memory start'.`);
|
|
16
21
|
return 1;
|
|
17
22
|
}
|
|
18
23
|
const tailN = opts.tail ? parseInt(opts.tail, 10) : 50;
|
|
@@ -20,12 +25,12 @@ export async function runMemoryLogs(opts) {
|
|
|
20
25
|
printWarning(`invalid --tail value: ${opts.tail}`);
|
|
21
26
|
return 1;
|
|
22
27
|
}
|
|
23
|
-
const args = ['
|
|
28
|
+
const args = ['logs', '--tail', String(tailN)];
|
|
24
29
|
if (opts.follow)
|
|
25
|
-
args.push('
|
|
26
|
-
args.push(
|
|
30
|
+
args.push('--follow');
|
|
31
|
+
args.push(MEMORY_SERVICE_CONTAINER);
|
|
27
32
|
printHeader(`olam memory logs (${opts.follow ? 'follow' : `tail -n ${tailN}`})`);
|
|
28
|
-
const child = spawn('
|
|
33
|
+
const child = spawn('docker', args, { stdio: 'inherit' });
|
|
29
34
|
return new Promise((resolve) => {
|
|
30
35
|
child.on('exit', (code) => resolve(code ?? 0));
|
|
31
36
|
});
|
|
@@ -33,7 +38,7 @@ export async function runMemoryLogs(opts) {
|
|
|
33
38
|
export function registerMemoryLogs(cmd) {
|
|
34
39
|
cmd
|
|
35
40
|
.command('logs')
|
|
36
|
-
.description('
|
|
41
|
+
.description('Stream the olam-memory-service container logs (Phase B substrate).')
|
|
37
42
|
.option('-f, --follow', 'Stream new log lines (Ctrl-C to stop)', false)
|
|
38
43
|
.option('--tail <n>', 'Number of trailing lines (default 50)', '50')
|
|
39
44
|
.action(async (opts) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/commands/memory/logs.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/commands/memory/logs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AAE5G,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAyC;IAC3E,MAAM,UAAU,GAAG,IAAI,gCAAgC,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IACnC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,YAAY,CACV,4EAA4E,CAC7E,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACzC,YAAY,CAAC,yBAAyB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAEpC,WAAW,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,KAAK,EAAE,GAAG,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACrC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,GAAG;SACA,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,oEAAoE,CAAC;SACjF,MAAM,CAAC,cAAc,EAAE,uCAAuC,EAAE,KAAK,CAAC;SACtE,MAAM,CAAC,YAAY,EAAE,uCAAuC,EAAE,IAAI,CAAC;SACnE,MAAM,CAAC,KAAK,EAAE,IAAyC,EAAE,EAAE;QAC1D,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,EAAE,KAAK,CAAC;YAAE,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mode.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC,yCAAyC;AACzC,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,wEAAwE;IACxE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,kCAAkC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAoDD,MAAM,MAAM,WAAW,GACnB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAA;CAAE,GAC5C;IAAE,OAAO,EAAE,kBAAkB,CAAA;CAAE,GAC/B;IAAE,OAAO,EAAE,kBAAkB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,wBAAsB,kBAAkB,CAAC,IAAI,GAAE,QAAa,GAAG,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"mode.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC,yCAAyC;AACzC,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,wEAAwE;IACxE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,kCAAkC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAoDD,MAAM,MAAM,WAAW,GACnB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAA;CAAE,GAC5C;IAAE,OAAO,EAAE,kBAAkB,CAAA;CAAE,GAC/B;IAAE,OAAO,EAAE,kBAAkB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,wBAAsB,kBAAkB,CAAC,IAAI,GAAE,QAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CA8BlF;AAED,wBAAsB,kBAAkB,CAAC,IAAI,GAAE,QAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CA2ElF;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CA+BrD"}
|
|
@@ -70,7 +70,11 @@ export async function runMemoryModeLocal(deps = {}) {
|
|
|
70
70
|
const { parsed } = readConfigYaml(cfg.absPath);
|
|
71
71
|
const currentMode = parsed.memory?.mode ?? 'local';
|
|
72
72
|
if (currentMode === 'local') {
|
|
73
|
-
|
|
73
|
+
// Phase B substrate semantics: `mode local` ensures the Docker container
|
|
74
|
+
// is running. Mechanism shifted from host-process spawn → docker container
|
|
75
|
+
// (memory-service-as-docker-peripheral Phase B B8). Intent — "the memory
|
|
76
|
+
// service runs locally rather than against a remote URL" — is preserved.
|
|
77
|
+
printInfo('memory.mode', 'already local — ensuring Docker container is up');
|
|
74
78
|
const rc = (deps.runStart ?? runMemoryStart)();
|
|
75
79
|
await rc;
|
|
76
80
|
return { outcome: 'noop', mode: 'local' };
|
|
@@ -79,10 +83,10 @@ export async function runMemoryModeLocal(deps = {}) {
|
|
|
79
83
|
parsed.memory = { mode: 'local' };
|
|
80
84
|
writeConfigYaml(cfg.absPath, parsed);
|
|
81
85
|
printSuccess(`flipped .olam/config.yaml memory.mode → local`);
|
|
82
|
-
printInfo('
|
|
86
|
+
printInfo('container', 'starting (Docker substrate)');
|
|
83
87
|
const rc = await (deps.runStart ?? runMemoryStart)();
|
|
84
88
|
if (rc !== 0) {
|
|
85
|
-
printWarning('local
|
|
89
|
+
printWarning('local Docker container failed to start. Config flipped but service is down — fix the underlying issue and run `olam memory start`.');
|
|
86
90
|
}
|
|
87
91
|
return { outcome: 'flipped-to-local' };
|
|
88
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../../src/commands/memory/mode.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../../src/commands/memory/mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAwBvC,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACtC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,MAAM,UAAU,OAAO,GAAG,mDAAmD,CAC9E,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAA4B,CAAC;IACjE,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,uBAAuB,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;AACzB,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,MAAe;IACvD,oEAAoE;IACpE,uEAAuE;IACvE,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,EAAE,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,QAAgB;IAC/C,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtF,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,mBAAmB,CAAC,QAAgB;IACjD,OAAO,iBAAiB,CAAC,GAAG,QAAQ,8CAA8C,CAAC,CAAC;AACtF,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAiB,EAAE;IAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAE/C,MAAM,WAAW,GAAI,MAAM,CAAC,MAAwC,EAAE,IAAI,IAAI,OAAO,CAAC;IACtF,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QAC5B,yEAAyE;QACzE,2EAA2E;QAC3E,yEAAyE;QACzE,yEAAyE;QACzE,SAAS,CAAC,aAAa,EAAE,iDAAiD,CAAC,CAAC;QAC5E,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC;QAC/C,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC5C,CAAC;IAED,0EAA0E;IAC1E,MAAM,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,CAAC,+CAA+C,CAAC,CAAC;IAE9D,SAAS,CAAC,WAAW,EAAE,6BAA6B,CAAC,CAAC;IACtD,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC;IACrD,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACb,YAAY,CACV,oIAAoI,CACrI,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAiB,EAAE;IAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAE/C,MAAM,UAAU,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAgD,CAAC;IACxF,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC;IAE/C,yDAAyD;IACzD,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACnB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,iBAAiB,CAAC;QACrD,GAAG,GAAG,CACJ,MAAM,OAAO,CAAC,sEAAsE,CAAC,CACtF,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IAED,6CAA6C;IAC7C,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,OAAgB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC;IAC7D,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACpD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,mEAAmE;IACnE,qEAAqE;IACrE,uEAAuE;IACvE,sEAAsE;IACtE,iDAAiD;IACjD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC;QAC3D,MAAM,GAAG,MAAM,SAAS,CAAC,2CAA2C,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,mFAAmF;IACnF,MAAM,OAAO,GAAG,WAAW,KAAK,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;IACzE,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,aAAa,EAAE,sBAAsB,GAAG,4BAA4B,CAAC,CAAC;QAChF,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACzE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC5C,CAAC;IAED,kEAAkE;IAClE,SAAS,CAAC,cAAc,EAAE,uCAAuC,CAAC,CAAC;IACnE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,aAAa,CAAC,EAAE,CAAC;IAExC,kEAAkE;IAClE,mEAAmE;IACnE,kEAAkE;IAClE,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACzE,YAAY,CAAC,gCAAgC,wBAAwB,SAAS,CAAC,CAAC;IAEhF,MAAM,CAAC,MAAM,GAAG;QACd,IAAI,EAAE,OAAO;QACb,KAAK,EAAE;YACL,GAAG;YACH,UAAU,EAAE,6BAA6B;SAC1C;KACF,CAAC;IACF,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,CAAC,kDAAkD,GAAG,GAAG,CAAC,CAAC;IAEvE,YAAY,CACV,yEAAyE;QACvE,2EAA2E,CAC9E,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,MAAM,IAAI,GAAG,GAAG;SACb,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CACV,iGAAiG,CAClG;SACA,MAAM,CAAC,aAAa,EAAE,2DAA2D,CAAC;SAClF,MAAM,CACL,kBAAkB,EAClB,6EAA6E,CAC9E,CAAC;IAEJ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,IAAuC,EAAE,EAAE;QAC5E,WAAW,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACvB,MAAM,kBAAkB,EAAE,CAAC;YAC7B,CAAC;iBAAM,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC9B,MAAM,kBAAkB,CAAC;oBACvB,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpD,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9D,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,yCAAyC,MAAM,GAAG,CAAC,CAAC;gBAC/D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* olam memory start —
|
|
2
|
+
* olam memory start — bring up the agent-memory service.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* cwd: ~/.olam (so agentmemory writes state under ~/.olam/data/)
|
|
11
|
-
* stdio: append to ~/.olam/memory-service.log
|
|
12
|
-
* detached: true so the child outlives this CLI invocation
|
|
13
|
-
* 5. Write child pid to ~/.olam/memory.pid
|
|
14
|
-
* 6. Poll http://localhost:3111/agentmemory/livez until 200 (timeout 30s)
|
|
4
|
+
* Phase B substrate: delegates to `MemoryServiceContainerController` so the
|
|
5
|
+
* service runs as a Docker container managed by the same lifecycle as
|
|
6
|
+
* kg-service / auth-service / mcp-auth-service. The legacy Phase A host-process
|
|
7
|
+
* model (spawning the `agentmemory` npm bin + writing `~/.olam/memory.pid`)
|
|
8
|
+
* is retired; legacy on-disk state is migrated away on first new-substrate
|
|
9
|
+
* invocation via `migrateFromHostProcess()`.
|
|
15
10
|
*
|
|
16
|
-
*
|
|
11
|
+
* Operator-facing surface unchanged:
|
|
12
|
+
* - `olam memory start` still produces a running service on :3111.
|
|
13
|
+
* - `bootstrap.ts:429` `runOlam(['memory', 'start'])` call site untouched.
|
|
14
|
+
* - `--skip-memory` / `OLAM_BOOTSTRAP_SKIP_MEMORY=1` still skip.
|
|
17
15
|
*
|
|
18
|
-
*
|
|
16
|
+
* Phase C deletes the host-process helpers from `_paths.ts` + drops the
|
|
17
|
+
* `@agentmemory/agentmemory` PUBLISH_DEPS entry. Until then, the host-process
|
|
18
|
+
* code paths are unreachable but present (clean-revert insurance).
|
|
19
|
+
*
|
|
20
|
+
* Plan reference: docs/plans/memory-service-as-docker-peripheral/phase-b-tasks.md B1
|
|
19
21
|
*/
|
|
20
22
|
import type { Command } from 'commander';
|
|
21
23
|
export declare function runMemoryStart(): Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/start.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/start.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQzC,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CA4DtD;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAQtD"}
|