@chendpoc/pi-memory 0.1.0 → 0.1.11
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/README.md +156 -111
- package/dist/adapters/ollamaClient.d.ts +11 -0
- package/dist/adapters/ollamaClient.d.ts.map +1 -0
- package/dist/adapters/ollamaClient.js +122 -0
- package/dist/adapters/ollamaClient.js.map +1 -0
- package/dist/adapters/openaiCompatClient.d.ts +11 -0
- package/dist/adapters/openaiCompatClient.d.ts.map +1 -0
- package/dist/adapters/openaiCompatClient.js +118 -0
- package/dist/adapters/openaiCompatClient.js.map +1 -0
- package/dist/cli.js +2 -2
- package/dist/cli.js.map +1 -1
- package/dist/fallback/sessionIndex.d.ts.map +1 -1
- package/dist/fallback/sessionIndex.js +90 -25
- package/dist/fallback/sessionIndex.js.map +1 -1
- package/dist/fallback/sessionSearch.d.ts +1 -1
- package/dist/fallback/sessionSearch.d.ts.map +1 -1
- package/dist/fallback/sessionSearch.js +101 -28
- package/dist/fallback/sessionSearch.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/local/graphQuery.d.ts +21 -0
- package/dist/local/graphQuery.d.ts.map +1 -0
- package/dist/local/graphQuery.js +170 -0
- package/dist/local/graphQuery.js.map +1 -0
- package/dist/paths.js +1 -1
- package/dist/paths.js.map +1 -1
- package/dist/pi-extension.d.ts.map +1 -1
- package/dist/pi-extension.js +57 -17
- package/dist/pi-extension.js.map +1 -1
- package/dist/service.d.ts +10 -10
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +72 -30
- package/dist/service.js.map +1 -1
- package/dist/settings.d.ts +38 -0
- package/dist/settings.d.ts.map +1 -0
- package/dist/settings.js +68 -0
- package/dist/settings.js.map +1 -0
- package/dist/sidecar/process.d.ts.map +1 -1
- package/dist/sidecar/process.js +16 -4
- package/dist/sidecar/process.js.map +1 -1
- package/dist/trainer/sessionLoader.d.ts +2 -2
- package/dist/trainer/sessionLoader.d.ts.map +1 -1
- package/dist/trainer/sessionLoader.js +115 -39
- package/dist/trainer/sessionLoader.js.map +1 -1
- package/package.json +5 -4
- package/src/adapters/ollamaClient.ts +179 -0
- package/src/adapters/openaiCompatClient.ts +155 -0
- package/src/cli.ts +4 -3
- package/src/fallback/sessionIndex.ts +78 -40
- package/src/fallback/sessionSearch.ts +107 -27
- package/src/index.ts +26 -0
- package/src/local/graphQuery.ts +228 -0
- package/src/paths.ts +1 -1
- package/src/pi-extension.ts +79 -17
- package/src/service.ts +78 -31
- package/src/settings.ts +126 -0
- package/src/sidecar/process.ts +19 -4
- package/src/trainer/sessionLoader.ts +128 -42
package/dist/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAqB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAA0C,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { defaultMemoryConfig, type ExtractorType, type MemoryConfig, type MemoryProvider, type TrainerConfig } from "./config.js";
|
|
2
|
+
import type { OllamaConfig } from "./adapters/ollamaClient.js";
|
|
3
|
+
import type { OpenAICompatConfig } from "./adapters/openaiCompatClient.js";
|
|
4
|
+
export interface MemorySettingsFile {
|
|
5
|
+
provider?: MemoryProvider;
|
|
6
|
+
tlmPath?: string;
|
|
7
|
+
socketPath?: string;
|
|
8
|
+
bundleRoot?: string;
|
|
9
|
+
sidecarReadyTimeoutMs?: number;
|
|
10
|
+
queryTimeoutMs?: number;
|
|
11
|
+
clientRequestTimeoutMs?: number;
|
|
12
|
+
sessionsDir?: string;
|
|
13
|
+
memoryMdPaths?: string[];
|
|
14
|
+
/** LLM for intent detection, rerank, and LLM extraction. Overrides default helper model. */
|
|
15
|
+
helperModel?: string;
|
|
16
|
+
/** Ollama local API config for helper / trainer / rerank. */
|
|
17
|
+
ollama?: Partial<OllamaConfig>;
|
|
18
|
+
/** OpenAI-compatible endpoint config (vLLM, SGLang, LM Studio, etc.) */
|
|
19
|
+
vllm?: Partial<OpenAICompatConfig>;
|
|
20
|
+
trainer?: Partial<TrainerConfig>;
|
|
21
|
+
}
|
|
22
|
+
export interface LoadedMemorySettings {
|
|
23
|
+
config: MemoryConfig;
|
|
24
|
+
helperModel: string | undefined;
|
|
25
|
+
ollama: OllamaConfig | null;
|
|
26
|
+
vllm: OpenAICompatConfig | null;
|
|
27
|
+
configPath: string;
|
|
28
|
+
}
|
|
29
|
+
/** Default path: ~/.pi/agent/memory.json */
|
|
30
|
+
export declare function defaultMemoryConfigPath(): string;
|
|
31
|
+
/** Load pi-memory config from ~/.pi/agent/memory.json. */
|
|
32
|
+
export declare function loadMemorySettings(overrides?: Partial<MemoryConfig>, configPath?: string): LoadedMemorySettings;
|
|
33
|
+
/** Convenience alias when only MemoryConfig is needed. */
|
|
34
|
+
export declare function loadMemoryConfig(overrides?: Partial<MemoryConfig>, configPath?: string): MemoryConfig;
|
|
35
|
+
export declare function resolveHelperModelSpec(flagValue: string | boolean | undefined, settingsHelperModel: string | undefined): string | undefined;
|
|
36
|
+
export { defaultMemoryConfig };
|
|
37
|
+
export type { ExtractorType, MemoryProvider, TrainerConfig };
|
|
38
|
+
//# sourceMappingURL=settings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,4FAA4F;IAC5F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/B,wEAAwE;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,4CAA4C;AAC5C,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAoBD,0DAA0D;AAC1D,wBAAgB,kBAAkB,CAChC,SAAS,GAAE,OAAO,CAAC,YAAY,CAAM,EACrC,UAAU,SAA4B,GACrC,oBAAoB,CAkCtB;AAED,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAC9B,SAAS,GAAE,OAAO,CAAC,YAAY,CAAM,EACrC,UAAU,SAA4B,GACrC,YAAY,CAEd;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,EACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GACtC,MAAM,GAAG,SAAS,CAKpB;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAC;AAC/B,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC"}
|
package/dist/settings.js
ADDED
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { getAgentDir } from "@earendil-works/pi-coding-agent";
|
|
4
|
+
import { defaultMemoryConfig, normalizeMemoryConfig, } from "./config.js";
|
|
5
|
+
/** Default path: ~/.pi/agent/memory.json */
|
|
6
|
+
export function defaultMemoryConfigPath() {
|
|
7
|
+
return path.join(getAgentDir(), "memory.json");
|
|
8
|
+
}
|
|
9
|
+
function readMemorySettingsFile(configPath = defaultMemoryConfigPath()) {
|
|
10
|
+
try {
|
|
11
|
+
const raw = fs.readFileSync(configPath, "utf8");
|
|
12
|
+
const parsed = JSON.parse(raw);
|
|
13
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
|
|
14
|
+
return {};
|
|
15
|
+
}
|
|
16
|
+
return parsed;
|
|
17
|
+
}
|
|
18
|
+
catch (err) {
|
|
19
|
+
if (err.code === "ENOENT") {
|
|
20
|
+
return {};
|
|
21
|
+
}
|
|
22
|
+
throw new Error(`Failed to load pi-memory config from ${configPath}: ${err instanceof Error ? err.message : String(err)}`);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
/** Load pi-memory config from ~/.pi/agent/memory.json. */
|
|
26
|
+
export function loadMemorySettings(overrides = {}, configPath = defaultMemoryConfigPath()) {
|
|
27
|
+
const fileSettings = readMemorySettingsFile(configPath);
|
|
28
|
+
const { helperModel, ollama, vllm, trainer, ...configFields } = fileSettings;
|
|
29
|
+
const config = normalizeMemoryConfig({
|
|
30
|
+
...configFields,
|
|
31
|
+
...(trainer ? { trainer } : {}),
|
|
32
|
+
...overrides,
|
|
33
|
+
});
|
|
34
|
+
let resolvedOllama = null;
|
|
35
|
+
if (ollama && ollama.model) {
|
|
36
|
+
resolvedOllama = {
|
|
37
|
+
baseUrl: ollama.baseUrl?.trim() || "http://localhost:11434",
|
|
38
|
+
model: ollama.model.trim(),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
let resolvedVllm = null;
|
|
42
|
+
if (vllm && vllm.model) {
|
|
43
|
+
resolvedVllm = {
|
|
44
|
+
baseUrl: vllm.baseUrl?.trim() || "http://localhost:8000",
|
|
45
|
+
model: vllm.model.trim(),
|
|
46
|
+
apiKey: vllm.apiKey?.trim() || undefined,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
config,
|
|
51
|
+
helperModel: helperModel?.trim() || undefined,
|
|
52
|
+
ollama: resolvedOllama,
|
|
53
|
+
vllm: resolvedVllm,
|
|
54
|
+
configPath,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
/** Convenience alias when only MemoryConfig is needed. */
|
|
58
|
+
export function loadMemoryConfig(overrides = {}, configPath = defaultMemoryConfigPath()) {
|
|
59
|
+
return loadMemorySettings(overrides, configPath).config;
|
|
60
|
+
}
|
|
61
|
+
export function resolveHelperModelSpec(flagValue, settingsHelperModel) {
|
|
62
|
+
if (typeof flagValue === "string" && flagValue.trim()) {
|
|
63
|
+
return flagValue.trim();
|
|
64
|
+
}
|
|
65
|
+
return settingsHelperModel;
|
|
66
|
+
}
|
|
67
|
+
export { defaultMemoryConfig };
|
|
68
|
+
//# sourceMappingURL=settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../src/sidecar/process.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,qBAAa,cAAc;IAIb,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHhC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;gBAEV,GAAG,EAAE,YAAY;IAO9C,SAAS,IAAI,aAAa;IAIpB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../src/sidecar/process.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,qBAAa,cAAc;IAIb,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHhC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;gBAEV,GAAG,EAAE,YAAY;IAO9C,SAAS,IAAI,aAAa;IAIpB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAWhC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiCtB,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CA2B5B"}
|
package/dist/sidecar/process.js
CHANGED
|
@@ -20,8 +20,10 @@ export class SidecarProcess {
|
|
|
20
20
|
await access(bin, constants.X_OK);
|
|
21
21
|
return bin;
|
|
22
22
|
}
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const resolved = await which(bin);
|
|
24
|
+
if (!resolved)
|
|
25
|
+
throw new Error(`${bin} not found in PATH`);
|
|
26
|
+
return resolved;
|
|
25
27
|
}
|
|
26
28
|
async spawn() {
|
|
27
29
|
const bin = await this.resolveBinary().catch(() => {
|
|
@@ -46,8 +48,8 @@ export class SidecarProcess {
|
|
|
46
48
|
stdio: "ignore",
|
|
47
49
|
detached: process.platform !== "win32",
|
|
48
50
|
});
|
|
49
|
-
this.child.on("error", (
|
|
50
|
-
|
|
51
|
+
this.child.on("error", () => {
|
|
52
|
+
/* handled by waitReady timeout */
|
|
51
53
|
});
|
|
52
54
|
this.child.unref?.();
|
|
53
55
|
}
|
|
@@ -110,6 +112,16 @@ export class SidecarProcess {
|
|
|
110
112
|
});
|
|
111
113
|
}
|
|
112
114
|
}
|
|
115
|
+
async function which(cmd) {
|
|
116
|
+
const { execFileSync } = await import("node:child_process");
|
|
117
|
+
try {
|
|
118
|
+
const result = execFileSync(process.platform === "win32" ? "where" : "which", [cmd], { encoding: "utf8", timeout: 3_000 }).trim();
|
|
119
|
+
return result.split("\n")[0]?.trim() || null;
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
113
125
|
function sleep(ms, signal) {
|
|
114
126
|
return new Promise((resolve, reject) => {
|
|
115
127
|
if (signal?.aborted) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/sidecar/process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,cAAc;IAII;IAHrB,KAAK,GAAwB,IAAI,CAAC;IACzB,MAAM,CAAgB;IAEvC,YAA6B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAC7B,GAAG,CAAC,UAAU,EACd,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAC5C,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,GAAG,CAAC;QACb,CAAC;QACD,
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/sidecar/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ export interface SessionLoaderOptions {
|
|
|
16
16
|
modifiedAfter?: Date | null;
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
19
|
-
* Scan session JSON
|
|
20
|
-
* modified-after timestamp for incremental training.
|
|
19
|
+
* Scan session files (JSON + JSONL, recursive subdirectories), parse Pi session
|
|
20
|
+
* format, optionally filter by modified-after timestamp for incremental training.
|
|
21
21
|
*/
|
|
22
22
|
export declare function loadSessions(opts: SessionLoaderOptions): Promise<LoadedSession[]>;
|
|
23
23
|
//# sourceMappingURL=sessionLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionLoader.d.ts","sourceRoot":"","sources":["../../src/trainer/sessionLoader.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB;
|
|
1
|
+
{"version":3,"file":"sessionLoader.d.ts","sourceRoot":"","sources":["../../src/trainer/sessionLoader.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB;AA+CD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CAC7B;AAsGD;;;GAGG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,aAAa,EAAE,CAAC,CAoC1B"}
|
|
@@ -23,69 +23,145 @@ function messageText(content) {
|
|
|
23
23
|
return parts.join("\n");
|
|
24
24
|
}
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
27
|
-
*
|
|
26
|
+
* Collect all session files recursively (supports project subdirectories).
|
|
27
|
+
* Returns both .json and .jsonl files.
|
|
28
28
|
*/
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
if (!sessionsDir.trim())
|
|
32
|
-
return [];
|
|
33
|
-
let entries;
|
|
29
|
+
async function collectSessionFiles(dir) {
|
|
30
|
+
let names;
|
|
34
31
|
try {
|
|
35
|
-
|
|
32
|
+
names = await fs.readdir(dir);
|
|
36
33
|
}
|
|
37
34
|
catch {
|
|
38
35
|
return [];
|
|
39
36
|
}
|
|
40
|
-
const
|
|
41
|
-
for (const name of
|
|
42
|
-
|
|
43
|
-
continue;
|
|
44
|
-
const filePath = path.join(sessionsDir, name);
|
|
37
|
+
const files = [];
|
|
38
|
+
for (const name of names) {
|
|
39
|
+
const full = path.join(dir, name);
|
|
45
40
|
let st;
|
|
46
41
|
try {
|
|
47
|
-
st = await fs.stat(
|
|
42
|
+
st = await fs.stat(full);
|
|
48
43
|
}
|
|
49
44
|
catch {
|
|
50
45
|
continue;
|
|
51
46
|
}
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
47
|
+
if (st.isDirectory()) {
|
|
48
|
+
const sub = await collectSessionFiles(full);
|
|
49
|
+
files.push(...sub);
|
|
50
|
+
}
|
|
51
|
+
else if (st.isFile() && (name.endsWith(".json") || name.endsWith(".jsonl"))) {
|
|
52
|
+
files.push(full);
|
|
56
53
|
}
|
|
57
|
-
|
|
54
|
+
}
|
|
55
|
+
return files;
|
|
56
|
+
}
|
|
57
|
+
function parseJsonlSession(raw, filePath) {
|
|
58
|
+
const lines = raw.split("\n").filter((l) => l.trim());
|
|
59
|
+
if (lines.length === 0)
|
|
60
|
+
return null;
|
|
61
|
+
let header = null;
|
|
62
|
+
const turns = [];
|
|
63
|
+
let turnIndex = 0;
|
|
64
|
+
for (const line of lines) {
|
|
65
|
+
let obj;
|
|
58
66
|
try {
|
|
59
|
-
|
|
60
|
-
session = JSON.parse(raw);
|
|
67
|
+
obj = JSON.parse(line);
|
|
61
68
|
}
|
|
62
69
|
catch {
|
|
63
70
|
continue;
|
|
64
71
|
}
|
|
65
|
-
if (
|
|
72
|
+
if (obj.type === "session" && !header) {
|
|
73
|
+
header = obj;
|
|
66
74
|
continue;
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
const msg =
|
|
75
|
+
}
|
|
76
|
+
if (obj.type === "message") {
|
|
77
|
+
const msg = obj.message;
|
|
78
|
+
if (!msg?.role || !msg.content)
|
|
79
|
+
continue;
|
|
80
|
+
if (msg.role !== "user" && msg.role !== "assistant")
|
|
81
|
+
continue;
|
|
70
82
|
const text = messageText(msg.content);
|
|
71
83
|
if (!text.trim())
|
|
72
84
|
continue;
|
|
73
|
-
turns.push({
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
85
|
+
turns.push({ role: msg.role, content: text, turnIndex: turnIndex++ });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (turns.length === 0)
|
|
89
|
+
return null;
|
|
90
|
+
return {
|
|
91
|
+
id: header?.id ?? path.basename(filePath, path.extname(filePath)),
|
|
92
|
+
title: header?.title ?? "",
|
|
93
|
+
createdAt: header?.timestamp ?? "",
|
|
94
|
+
filePath,
|
|
95
|
+
modifiedAt: new Date(),
|
|
96
|
+
turns,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
function parseJsonSession(raw, filePath) {
|
|
100
|
+
let session;
|
|
101
|
+
try {
|
|
102
|
+
session = JSON.parse(raw);
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
return null;
|
|
106
|
+
}
|
|
107
|
+
if (!session.messages || session.messages.length === 0)
|
|
108
|
+
return null;
|
|
109
|
+
const turns = [];
|
|
110
|
+
for (let i = 0; i < session.messages.length; i++) {
|
|
111
|
+
const msg = session.messages[i];
|
|
112
|
+
const text = messageText(msg.content);
|
|
113
|
+
if (!text.trim())
|
|
114
|
+
continue;
|
|
115
|
+
turns.push({ role: msg.role ?? "unknown", content: text, turnIndex: i });
|
|
116
|
+
}
|
|
117
|
+
if (turns.length === 0)
|
|
118
|
+
return null;
|
|
119
|
+
return {
|
|
120
|
+
id: session.id ?? path.basename(filePath, ".json"),
|
|
121
|
+
title: session.title ?? "",
|
|
122
|
+
createdAt: session.created_at ?? "",
|
|
123
|
+
filePath,
|
|
124
|
+
modifiedAt: new Date(),
|
|
125
|
+
turns,
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Scan session files (JSON + JSONL, recursive subdirectories), parse Pi session
|
|
130
|
+
* format, optionally filter by modified-after timestamp for incremental training.
|
|
131
|
+
*/
|
|
132
|
+
export async function loadSessions(opts) {
|
|
133
|
+
const { sessionsDir, modifiedAfter } = opts;
|
|
134
|
+
if (!sessionsDir.trim())
|
|
135
|
+
return [];
|
|
136
|
+
const filePaths = await collectSessionFiles(sessionsDir);
|
|
137
|
+
const sessions = [];
|
|
138
|
+
for (const filePath of filePaths) {
|
|
139
|
+
let st;
|
|
140
|
+
try {
|
|
141
|
+
st = await fs.stat(filePath);
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
if (!st.isFile())
|
|
147
|
+
continue;
|
|
148
|
+
if (modifiedAfter && st.mtime <= modifiedAfter)
|
|
149
|
+
continue;
|
|
150
|
+
let raw;
|
|
151
|
+
try {
|
|
152
|
+
raw = await fs.readFile(filePath, "utf8");
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
continue;
|
|
78
156
|
}
|
|
79
|
-
|
|
157
|
+
const isJsonl = filePath.endsWith(".jsonl");
|
|
158
|
+
const parsed = isJsonl
|
|
159
|
+
? parseJsonlSession(raw, filePath)
|
|
160
|
+
: parseJsonSession(raw, filePath);
|
|
161
|
+
if (!parsed)
|
|
80
162
|
continue;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
title: session.title ?? "",
|
|
84
|
-
createdAt: session.created_at ?? "",
|
|
85
|
-
filePath,
|
|
86
|
-
modifiedAt: st.mtime,
|
|
87
|
-
turns,
|
|
88
|
-
});
|
|
163
|
+
parsed.modifiedAt = st.mtime;
|
|
164
|
+
sessions.push(parsed);
|
|
89
165
|
}
|
|
90
166
|
sessions.sort((a, b) => a.modifiedAt.getTime() - b.modifiedAt.getTime());
|
|
91
167
|
return deduplicateSessions(sessions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionLoader.js","sourceRoot":"","sources":["../../src/trainer/sessionLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionLoader.js","sourceRoot":"","sources":["../../src/trainer/sessionLoader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chendpoc/pi-memory",
|
|
3
|
-
"version": "0.1.
|
|
4
|
-
"description": "Local episodic memory for Pi agent —
|
|
3
|
+
"version": "0.1.11",
|
|
4
|
+
"description": "Local episodic memory for Pi coding agent — knowledge graph + memory_recall tool + implicit preflight",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
7
7
|
"types": "./dist/index.d.ts",
|
|
@@ -33,13 +33,14 @@
|
|
|
33
33
|
"engines": {
|
|
34
34
|
"node": ">=20"
|
|
35
35
|
},
|
|
36
|
+
"packageManager": "pnpm@10.12.1",
|
|
36
37
|
"keywords": [
|
|
37
38
|
"pi-package",
|
|
38
39
|
"pi-extension",
|
|
39
40
|
"pi-agent",
|
|
40
|
-
"tlm",
|
|
41
41
|
"episodic-memory",
|
|
42
|
-
"
|
|
42
|
+
"knowledge-graph",
|
|
43
|
+
"memory-recall"
|
|
43
44
|
],
|
|
44
45
|
"license": "MIT",
|
|
45
46
|
"author": "chendpoc",
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
import http from "node:http";
|
|
2
|
+
import https from "node:https";
|
|
3
|
+
|
|
4
|
+
import type { LLMClient } from "../trainer/llmExtractor.js";
|
|
5
|
+
import type { MemoryHelperLLM } from "../preflight/detectIntents.js";
|
|
6
|
+
import type { CompileMemoryIntentsResult } from "../preflight/detectIntents.js";
|
|
7
|
+
import {
|
|
8
|
+
COMPILE_MEMORY_INTENTS_PARAMETERS,
|
|
9
|
+
MEMORY_HELPER_TOOL_NAME,
|
|
10
|
+
} from "../preflight/detectIntents.js";
|
|
11
|
+
|
|
12
|
+
export interface OllamaConfig {
|
|
13
|
+
baseUrl: string;
|
|
14
|
+
model: string;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export const DEFAULT_OLLAMA_CONFIG: OllamaConfig = {
|
|
18
|
+
baseUrl: "http://localhost:11434",
|
|
19
|
+
model: "qwen3:8b",
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
interface OllamaChatMessage {
|
|
23
|
+
role: "system" | "user" | "assistant";
|
|
24
|
+
content: string;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
interface OllamaChatRequest {
|
|
28
|
+
model: string;
|
|
29
|
+
messages: OllamaChatMessage[];
|
|
30
|
+
stream: false;
|
|
31
|
+
tools?: OllamaTool[];
|
|
32
|
+
options?: { num_predict?: number };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
interface OllamaTool {
|
|
36
|
+
type: "function";
|
|
37
|
+
function: {
|
|
38
|
+
name: string;
|
|
39
|
+
description: string;
|
|
40
|
+
parameters: Record<string, unknown>;
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
interface OllamaChatResponse {
|
|
45
|
+
message?: {
|
|
46
|
+
role?: string;
|
|
47
|
+
content?: string;
|
|
48
|
+
tool_calls?: Array<{
|
|
49
|
+
function?: {
|
|
50
|
+
name?: string;
|
|
51
|
+
arguments?: Record<string, unknown>;
|
|
52
|
+
};
|
|
53
|
+
}>;
|
|
54
|
+
};
|
|
55
|
+
error?: string;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
async function ollamaRequest<T>(
|
|
59
|
+
baseUrl: string,
|
|
60
|
+
path: string,
|
|
61
|
+
body: unknown,
|
|
62
|
+
): Promise<T> {
|
|
63
|
+
const url = new URL(path, baseUrl);
|
|
64
|
+
const mod = url.protocol === "https:" ? https : http;
|
|
65
|
+
const payload = JSON.stringify(body);
|
|
66
|
+
|
|
67
|
+
return new Promise((resolve, reject) => {
|
|
68
|
+
const req = mod.request(
|
|
69
|
+
url,
|
|
70
|
+
{
|
|
71
|
+
method: "POST",
|
|
72
|
+
headers: {
|
|
73
|
+
"Content-Type": "application/json",
|
|
74
|
+
"Content-Length": Buffer.byteLength(payload),
|
|
75
|
+
},
|
|
76
|
+
timeout: 60_000,
|
|
77
|
+
},
|
|
78
|
+
(res) => {
|
|
79
|
+
const chunks: Buffer[] = [];
|
|
80
|
+
res.on("data", (c) => chunks.push(c));
|
|
81
|
+
res.on("end", () => {
|
|
82
|
+
const text = Buffer.concat(chunks).toString("utf8");
|
|
83
|
+
try {
|
|
84
|
+
resolve(JSON.parse(text) as T);
|
|
85
|
+
} catch {
|
|
86
|
+
reject(new Error(`Ollama: invalid JSON response: ${text.slice(0, 200)}`));
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
},
|
|
90
|
+
);
|
|
91
|
+
req.on("error", (err) => reject(new Error(`Ollama: ${err.message}`)));
|
|
92
|
+
req.on("timeout", () => {
|
|
93
|
+
req.destroy();
|
|
94
|
+
reject(new Error("Ollama: request timeout"));
|
|
95
|
+
});
|
|
96
|
+
req.write(payload);
|
|
97
|
+
req.end();
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
export async function ollamaHealthCheck(baseUrl: string): Promise<boolean> {
|
|
102
|
+
try {
|
|
103
|
+
const url = new URL("/api/tags", baseUrl);
|
|
104
|
+
const mod = url.protocol === "https:" ? https : http;
|
|
105
|
+
return new Promise((resolve) => {
|
|
106
|
+
const req = mod.get(url, { timeout: 3_000 }, (res) => {
|
|
107
|
+
res.resume();
|
|
108
|
+
resolve(res.statusCode === 200);
|
|
109
|
+
});
|
|
110
|
+
req.on("error", () => resolve(false));
|
|
111
|
+
req.on("timeout", () => { req.destroy(); resolve(false); });
|
|
112
|
+
});
|
|
113
|
+
} catch {
|
|
114
|
+
return false;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
export function createOllamaLLMClient(cfg: OllamaConfig): LLMClient {
|
|
119
|
+
return {
|
|
120
|
+
async complete(prompt: string): Promise<string> {
|
|
121
|
+
const body: OllamaChatRequest = {
|
|
122
|
+
model: cfg.model,
|
|
123
|
+
messages: [{ role: "user", content: prompt }],
|
|
124
|
+
stream: false,
|
|
125
|
+
options: { num_predict: 8192 },
|
|
126
|
+
};
|
|
127
|
+
const resp = await ollamaRequest<OllamaChatResponse>(cfg.baseUrl, "/api/chat", body);
|
|
128
|
+
if (resp.error) throw new Error(`Ollama: ${resp.error}`);
|
|
129
|
+
const text = resp.message?.content?.trim();
|
|
130
|
+
if (!text) throw new Error("Ollama: empty response");
|
|
131
|
+
return text;
|
|
132
|
+
},
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
export function createOllamaMemoryHelper(cfg: OllamaConfig): MemoryHelperLLM {
|
|
137
|
+
return {
|
|
138
|
+
async compileIntents(text: string): Promise<CompileMemoryIntentsResult> {
|
|
139
|
+
const body: OllamaChatRequest = {
|
|
140
|
+
model: cfg.model,
|
|
141
|
+
messages: [
|
|
142
|
+
{
|
|
143
|
+
role: "user",
|
|
144
|
+
content: `Analyze whether the user message requires recalling private episodic memory.\n\n<message>\n${text}\n</message>`,
|
|
145
|
+
},
|
|
146
|
+
],
|
|
147
|
+
stream: false,
|
|
148
|
+
tools: [
|
|
149
|
+
{
|
|
150
|
+
type: "function",
|
|
151
|
+
function: {
|
|
152
|
+
name: MEMORY_HELPER_TOOL_NAME,
|
|
153
|
+
description: "Decide whether to recall private episodic memory and compile structured query intents.",
|
|
154
|
+
parameters: COMPILE_MEMORY_INTENTS_PARAMETERS as unknown as Record<string, unknown>,
|
|
155
|
+
},
|
|
156
|
+
},
|
|
157
|
+
],
|
|
158
|
+
options: { num_predict: 2048 },
|
|
159
|
+
};
|
|
160
|
+
const resp = await ollamaRequest<OllamaChatResponse>(cfg.baseUrl, "/api/chat", body);
|
|
161
|
+
if (resp.error) throw new Error(`Ollama: ${resp.error}`);
|
|
162
|
+
|
|
163
|
+
const toolCall = resp.message?.tool_calls?.[0]?.function;
|
|
164
|
+
if (toolCall?.name === MEMORY_HELPER_TOOL_NAME && toolCall.arguments) {
|
|
165
|
+
return toolCall.arguments as unknown as CompileMemoryIntentsResult;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
const raw = resp.message?.content?.trim();
|
|
169
|
+
if (!raw) return { should_recall: false, intents: [] };
|
|
170
|
+
|
|
171
|
+
try {
|
|
172
|
+
const cleaned = raw.replace(/^```(?:json)?\s*/m, "").replace(/\s*```\s*$/m, "").trim();
|
|
173
|
+
return JSON.parse(cleaned) as CompileMemoryIntentsResult;
|
|
174
|
+
} catch {
|
|
175
|
+
return { should_recall: false, intents: [] };
|
|
176
|
+
}
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
}
|