deepclause-sdk 0.0.58 → 0.0.60
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 +71 -19
- package/dist/cli/compile.d.ts +9 -0
- package/dist/cli/compile.d.ts.map +1 -1
- package/dist/cli/compile.js +106 -138
- package/dist/cli/compile.js.map +1 -1
- package/dist/cli/config.d.ts +73 -23
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +151 -58
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/index.js +64 -14
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/interactive.d.ts +2 -0
- package/dist/cli/interactive.d.ts.map +1 -0
- package/dist/cli/interactive.js +20 -0
- package/dist/cli/interactive.js.map +1 -0
- package/dist/cli/prompt.d.ts +1 -19
- package/dist/cli/prompt.d.ts.map +1 -1
- package/dist/cli/prompt.js +1 -869
- package/dist/cli/prompt.js.map +1 -1
- package/dist/cli/run.d.ts +6 -1
- package/dist/cli/run.d.ts.map +1 -1
- package/dist/cli/run.js +65 -279
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/search.d.ts +1 -0
- package/dist/cli/search.d.ts.map +1 -1
- package/dist/cli/search.js +10 -4
- package/dist/cli/search.js.map +1 -1
- package/dist/cli/tools.d.ts +2 -2
- package/dist/cli/tools.d.ts.map +1 -1
- package/dist/cli/tools.js +30 -5
- package/dist/cli/tools.js.map +1 -1
- package/dist/cli/tui.d.ts +58 -0
- package/dist/cli/tui.d.ts.map +1 -0
- package/dist/cli/tui.js +1742 -0
- package/dist/cli/tui.js.map +1 -0
- package/dist/compiler_prompt.d.ts +1 -1
- package/dist/compiler_prompt.d.ts.map +1 -1
- package/dist/compiler_prompt.js +8 -10
- package/dist/compiler_prompt.js.map +1 -1
- package/dist/prolog-src/deepclause_mi.pl +25 -4
- package/dist/prolog-src/deepclause_strings.pl +22 -2
- package/dist/system/assets/docs/CONDUCTOR_PROMPT.md +46 -0
- package/dist/system/assets/docs/DML_COMPILER_PROMPT.md +654 -0
- package/dist/system/assets/index.d.ts +9 -0
- package/dist/system/assets/index.d.ts.map +1 -0
- package/dist/system/assets/index.js +47 -0
- package/dist/system/assets/index.js.map +1 -0
- package/dist/system/assets/skills/conductor.dml +70 -0
- package/dist/system/assets/skills/skill-creator.dml +182 -0
- package/dist/system/config/model-slots.d.ts +34 -0
- package/dist/system/config/model-slots.d.ts.map +1 -0
- package/dist/system/config/model-slots.js +121 -0
- package/dist/system/config/model-slots.js.map +1 -0
- package/dist/system/runtime/agentvm-manager.d.ts +18 -0
- package/dist/system/runtime/agentvm-manager.d.ts.map +1 -0
- package/dist/system/runtime/agentvm-manager.js +98 -0
- package/dist/system/runtime/agentvm-manager.js.map +1 -0
- package/dist/system/runtime/conductor.d.ts +54 -0
- package/dist/system/runtime/conductor.d.ts.map +1 -0
- package/dist/system/runtime/conductor.js +457 -0
- package/dist/system/runtime/conductor.js.map +1 -0
- package/dist/system/runtime/console-capture.d.ts +9 -0
- package/dist/system/runtime/console-capture.d.ts.map +1 -0
- package/dist/system/runtime/console-capture.js +67 -0
- package/dist/system/runtime/console-capture.js.map +1 -0
- package/dist/system/runtime/dml-executor.d.ts +41 -0
- package/dist/system/runtime/dml-executor.d.ts.map +1 -0
- package/dist/system/runtime/dml-executor.js +137 -0
- package/dist/system/runtime/dml-executor.js.map +1 -0
- package/dist/system/runtime/runtime-tools.d.ts +16 -0
- package/dist/system/runtime/runtime-tools.d.ts.map +1 -0
- package/dist/system/runtime/runtime-tools.js +146 -0
- package/dist/system/runtime/runtime-tools.js.map +1 -0
- package/dist/system/runtime/shell-manager.d.ts +20 -0
- package/dist/system/runtime/shell-manager.d.ts.map +1 -0
- package/dist/system/runtime/shell-manager.js +133 -0
- package/dist/system/runtime/shell-manager.js.map +1 -0
- package/dist/system/runtime/skill-creator.d.ts +33 -0
- package/dist/system/runtime/skill-creator.d.ts.map +1 -0
- package/dist/system/runtime/skill-creator.js +583 -0
- package/dist/system/runtime/skill-creator.js.map +1 -0
- package/dist/system/runtime/token-usage.d.ts +16 -0
- package/dist/system/runtime/token-usage.d.ts.map +1 -0
- package/dist/system/runtime/token-usage.js +45 -0
- package/dist/system/runtime/token-usage.js.map +1 -0
- package/dist/tools.js +1 -1
- package/dist/tools.js.map +1 -1
- package/package.json +4 -3
- package/src/prolog-src/deepclause_mi.pl +25 -4
- package/src/prolog-src/deepclause_strings.pl +22 -2
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
export function createTokenUsageTotals() {
|
|
2
|
+
return {
|
|
3
|
+
calls: 0,
|
|
4
|
+
inputTokens: 0,
|
|
5
|
+
outputTokens: 0,
|
|
6
|
+
totalTokens: 0,
|
|
7
|
+
cacheReadTokens: 0,
|
|
8
|
+
cacheWriteTokens: 0,
|
|
9
|
+
reasoningTokens: 0,
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export function isTokenUsageEmpty(usageByModel) {
|
|
13
|
+
return Object.keys(usageByModel).length === 0;
|
|
14
|
+
}
|
|
15
|
+
export function recordTokenUsage(usageByModel, modelId, usage) {
|
|
16
|
+
if (!modelId || !usage) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const totals = usageByModel[modelId] ?? (usageByModel[modelId] = createTokenUsageTotals());
|
|
20
|
+
totals.calls += 1;
|
|
21
|
+
totals.inputTokens += usage.inputTokens ?? 0;
|
|
22
|
+
totals.outputTokens += usage.outputTokens ?? 0;
|
|
23
|
+
totals.totalTokens += usage.totalTokens ?? 0;
|
|
24
|
+
totals.cacheReadTokens += usage.cacheReadTokens ?? 0;
|
|
25
|
+
totals.cacheWriteTokens += usage.cacheWriteTokens ?? 0;
|
|
26
|
+
totals.reasoningTokens += usage.reasoningTokens ?? 0;
|
|
27
|
+
}
|
|
28
|
+
export function mergeTokenUsageMaps(base, delta) {
|
|
29
|
+
const merged = {};
|
|
30
|
+
for (const [modelId, usage] of Object.entries(base)) {
|
|
31
|
+
merged[modelId] = { ...usage };
|
|
32
|
+
}
|
|
33
|
+
for (const [modelId, usage] of Object.entries(delta)) {
|
|
34
|
+
const totals = merged[modelId] ?? (merged[modelId] = createTokenUsageTotals());
|
|
35
|
+
totals.calls += usage.calls;
|
|
36
|
+
totals.inputTokens += usage.inputTokens;
|
|
37
|
+
totals.outputTokens += usage.outputTokens;
|
|
38
|
+
totals.totalTokens += usage.totalTokens;
|
|
39
|
+
totals.cacheReadTokens += usage.cacheReadTokens;
|
|
40
|
+
totals.cacheWriteTokens += usage.cacheWriteTokens;
|
|
41
|
+
totals.reasoningTokens += usage.reasoningTokens;
|
|
42
|
+
}
|
|
43
|
+
return merged;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=token-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../../src/system/runtime/token-usage.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL,KAAK,EAAE,CAAC;QACR,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,CAAC;QACd,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,CAAC;QACnB,eAAe,EAAE,CAAC;KACnB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,YAA+B;IAC/D,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,YAA+B,EAC/B,OAA2B,EAC3B,KAA2B;IAE3B,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,sBAAsB,EAAE,CAAC,CAAC;IAC3F,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;IAClB,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC;IAC7C,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;IAC/C,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC;IAC7C,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;IACrD,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;IACvD,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAuB,EAAE,KAAwB;IACnF,MAAM,MAAM,GAAsB,EAAE,CAAC;IAErC,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACpD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,sBAAsB,EAAE,CAAC,CAAC;QAC/E,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;QAC5B,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,CAAC;QACxC,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,CAAC;QAC1C,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,CAAC;QACxC,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC;QAChD,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,CAAC;QAClD,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC;IAClD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/tools.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
export const BUILTIN_COMPILE_TOOLS = [
|
|
8
8
|
{
|
|
9
9
|
name: 'vm_exec',
|
|
10
|
-
description: 'Execute a shell command
|
|
10
|
+
description: 'Execute a shell command using the active workspace shell backend. With --sandbox, this runs inside AgentVM.',
|
|
11
11
|
provider: 'agentvm',
|
|
12
12
|
schema: {
|
|
13
13
|
type: 'object',
|
package/dist/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkB;IAClD;QACE,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkB;IAClD;QACE,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,6GAA6G;QAC1H,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,8EAA8E,EAAE;aACzH;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC;SACtB;KACF;IACD;QACE,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,wGAAwG;QACrH,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;gBACtD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,0CAA0C,EAAE;gBAClF,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qFAAqF,EAAE;aAClI;YACD,QAAQ,EAAE,CAAC,OAAO,CAAC;SACpB;KACF;IACD;QACE,IAAI,EAAE,aAAa;QACnB,WAAW,EAAE,yDAAyD;QACtE,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;gBACtD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,0CAA0C,EAAE;gBAClF,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qEAAqE,EAAE;aAClH;YACD,QAAQ,EAAE,CAAC,OAAO,CAAC;SACpB;KACF;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,sBAAsB;IACpC,OAAO,CAAC,GAAG,qBAAqB,CAAC,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAC7B,QAAgB,EAChB,MAAyB;IAEzB,wCAAwC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAElF,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,SAAS,QAAQ,2BAA2B;SACrD,CAAC;IACJ,CAAC;IAED,iBAAiB;IACjB,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,SAAS,QAAQ,2BAA2B;SACrD,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,OAAe,EAAE,QAAgB;IACzD,gCAAgC;IAChC,MAAM,YAAY,GAAG,OAAO;SACzB,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC,gCAAgC;SACrE,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,kBAAkB;IAE3C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,uCAAuC;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,IAAI,GAAc,EAAE,CAAC;IAE3B,iDAAiD;IACjD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,UAAU,GAAG,EAAE,CAAC;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjC,QAAQ,GAAG,IAAI,CAAC;gBAChB,UAAU,GAAG,IAAI,CAAC;gBAClB,OAAO,IAAI,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACxD,KAAK,EAAE,CAAC;gBACR,OAAO,IAAI,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACxD,KAAK,EAAE,CAAC;gBACR,OAAO,IAAI,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,IAAI,KAAK,GAAG,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACtC,OAAO,GAAG,EAAE,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,IAAI,CAAC;YAClB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,IAAI,CAAC;YAChB,IAAI,IAAI,KAAK,UAAU,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC7C,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,GAAW;IAC7B,iBAAiB;IACjB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1C,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC/C,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACpB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;aACpB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;aACpB,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,SAAS;IACT,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACxB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAChB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,UAAU;IACV,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,GAAG,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAElC,OAAO;IACP,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C,+BAA+B;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC;QAC7B,iDAAiD;QACjD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,mBAAmB;IACnB,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "deepclause-sdk",
|
|
3
|
-
"version": "0.0.
|
|
4
|
-
"description": "DeepClause CLI Tool and Typescript SDK",
|
|
3
|
+
"version": "0.0.60",
|
|
4
|
+
"description": "DeepClause CLI Tool, TUI and Typescript SDK",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"types": "dist/index.d.ts",
|
|
@@ -19,8 +19,9 @@
|
|
|
19
19
|
}
|
|
20
20
|
},
|
|
21
21
|
"scripts": {
|
|
22
|
-
"build": "tsc && npm run copy:prolog",
|
|
22
|
+
"build": "tsc && npm run copy:prolog && npm run copy:assets",
|
|
23
23
|
"copy:prolog": "cp src/prolog-src/*.pl dist/prolog-src/",
|
|
24
|
+
"copy:assets": "mkdir -p dist/system/assets/skills dist/system/assets/docs && cp src/system/assets/skills/*.dml dist/system/assets/skills/ && cp src/system/assets/docs/*.md dist/system/assets/docs/",
|
|
24
25
|
"test": "vitest run",
|
|
25
26
|
"test:watch": "vitest",
|
|
26
27
|
"test:coverage": "vitest run --coverage",
|
|
@@ -2199,14 +2199,15 @@ flatten_conjunction((A1, A2), B, Result) :- !,
|
|
|
2199
2199
|
flatten_conjunction(A, B, (A, B)).
|
|
2200
2200
|
|
|
2201
2201
|
%% string_needs_interpolation(+String)
|
|
2202
|
-
%% Check if a string contains {VarName} patterns
|
|
2202
|
+
%% Check if a string contains identifier-like {VarName} patterns
|
|
2203
2203
|
string_needs_interpolation(String) :-
|
|
2204
2204
|
( string(String) -> S = String
|
|
2205
2205
|
; atom(String) -> atom_string(String, S)
|
|
2206
2206
|
; fail
|
|
2207
2207
|
),
|
|
2208
|
-
|
|
2209
|
-
|
|
2208
|
+
string_codes(S, Codes),
|
|
2209
|
+
extract_vars_from_codes(Codes, VarNames, _),
|
|
2210
|
+
VarNames \= [].
|
|
2210
2211
|
|
|
2211
2212
|
%% build_format_call(+Template, +Bindings, -TempVar, -FormatGoal)
|
|
2212
2213
|
%% Build a format/3 call that produces the interpolated string
|
|
@@ -2247,11 +2248,17 @@ extract_interpolation_vars(Template, VarNames, FormatString) :-
|
|
|
2247
2248
|
extract_vars_from_codes([], [], []) :- !.
|
|
2248
2249
|
|
|
2249
2250
|
% Found opening brace
|
|
2250
|
-
extract_vars_from_codes([0'{|Rest], [VarName|VarNames], [0'~, 0'w|FormatRest]) :-
|
|
2251
|
+
extract_vars_from_codes([0'{|Rest], [VarName|VarNames], [0'~, 0'w|FormatRest]) :-
|
|
2251
2252
|
extract_var_until_close(Rest, VarNameCodes, AfterClose),
|
|
2253
|
+
valid_placeholder_codes(VarNameCodes),
|
|
2254
|
+
!,
|
|
2252
2255
|
atom_codes(VarName, VarNameCodes),
|
|
2253
2256
|
extract_vars_from_codes(AfterClose, VarNames, FormatRest).
|
|
2254
2257
|
|
|
2258
|
+
% Invalid placeholder syntax - keep the opening brace literal
|
|
2259
|
+
extract_vars_from_codes([0'{|Rest], VarNames, [0'{|FormatRest]) :- !,
|
|
2260
|
+
extract_vars_from_codes(Rest, VarNames, FormatRest).
|
|
2261
|
+
|
|
2255
2262
|
% Escape tilde for format/3
|
|
2256
2263
|
extract_vars_from_codes([0'~|Rest], VarNames, [0'~, 0'~|FormatRest]) :- !,
|
|
2257
2264
|
extract_vars_from_codes(Rest, VarNames, FormatRest).
|
|
@@ -2266,6 +2273,20 @@ extract_var_until_close([C|Rest], [C|VarRest], Final) :-
|
|
|
2266
2273
|
extract_var_until_close(Rest, VarRest, Final).
|
|
2267
2274
|
extract_var_until_close([], [], []).
|
|
2268
2275
|
|
|
2276
|
+
%% valid_placeholder_codes(+Codes)
|
|
2277
|
+
%% Placeholder names must look like identifiers: [A-Za-z_][A-Za-z0-9_]*
|
|
2278
|
+
valid_placeholder_codes([First|Rest]) :-
|
|
2279
|
+
valid_placeholder_start(First),
|
|
2280
|
+
maplist(valid_placeholder_char, Rest).
|
|
2281
|
+
|
|
2282
|
+
valid_placeholder_start(Code) :-
|
|
2283
|
+
code_type(Code, alpha)
|
|
2284
|
+
; Code =:= 0'_.
|
|
2285
|
+
|
|
2286
|
+
valid_placeholder_char(Code) :-
|
|
2287
|
+
code_type(Code, alnum)
|
|
2288
|
+
; Code =:= 0'_.
|
|
2289
|
+
|
|
2269
2290
|
%% lookup_vars_with_params(+VarNames, +Bindings, -VarList, -ParamGoals)
|
|
2270
2291
|
%% Look up each variable name:
|
|
2271
2292
|
%% - If in Bindings (local Prolog variable) → use directly
|
|
@@ -36,10 +36,11 @@ interpolate_atom(Template, Bindings, Result) :-
|
|
|
36
36
|
%% Process character codes, replacing {var} patterns
|
|
37
37
|
interpolate_codes([], _, []) :- !.
|
|
38
38
|
|
|
39
|
-
% Found opening brace -
|
|
39
|
+
% Found opening brace - replace only identifier-like placeholders
|
|
40
40
|
interpolate_codes([0'{|Rest], Bindings, Result) :-
|
|
41
|
-
!,
|
|
42
41
|
extract_var_name(Rest, VarNameCodes, AfterVar),
|
|
42
|
+
valid_placeholder_codes(VarNameCodes),
|
|
43
|
+
!,
|
|
43
44
|
atom_codes(VarName, VarNameCodes),
|
|
44
45
|
( find_binding(VarName, Bindings, Value)
|
|
45
46
|
-> format(atom(ValueAtom), '~w', [Value]),
|
|
@@ -51,6 +52,11 @@ interpolate_codes([0'{|Rest], Bindings, Result) :-
|
|
|
51
52
|
append([0'{|VarNameCodes], [0'}|RestResult], Result)
|
|
52
53
|
).
|
|
53
54
|
|
|
55
|
+
% Invalid placeholder syntax - keep the opening brace literal
|
|
56
|
+
interpolate_codes([0'{|Rest], Bindings, [0'{|Result]) :-
|
|
57
|
+
!,
|
|
58
|
+
interpolate_codes(Rest, Bindings, Result).
|
|
59
|
+
|
|
54
60
|
% Regular character - keep it
|
|
55
61
|
interpolate_codes([C|Rest], Bindings, [C|Result]) :-
|
|
56
62
|
interpolate_codes(Rest, Bindings, Result).
|
|
@@ -63,6 +69,20 @@ extract_var_name([C|Rest], [C|VarRest], Final) :-
|
|
|
63
69
|
extract_var_name(Rest, VarRest, Final).
|
|
64
70
|
extract_var_name([], [], []). % Handle unclosed brace gracefully
|
|
65
71
|
|
|
72
|
+
%% valid_placeholder_codes(+Codes)
|
|
73
|
+
%% Placeholder names must look like identifiers: [A-Za-z_][A-Za-z0-9_]*
|
|
74
|
+
valid_placeholder_codes([First|Rest]) :-
|
|
75
|
+
valid_placeholder_start(First),
|
|
76
|
+
maplist(valid_placeholder_char, Rest).
|
|
77
|
+
|
|
78
|
+
valid_placeholder_start(Code) :-
|
|
79
|
+
code_type(Code, alpha)
|
|
80
|
+
; Code =:= 0'_.
|
|
81
|
+
|
|
82
|
+
valid_placeholder_char(Code) :-
|
|
83
|
+
code_type(Code, alnum)
|
|
84
|
+
; Code =:= 0'_.
|
|
85
|
+
|
|
66
86
|
%% find_binding(+VarName, +Bindings, -Value)
|
|
67
87
|
%% Look up a variable in the bindings list
|
|
68
88
|
find_binding(VarName, Bindings, Value) :-
|