@atomic-chat/core 0.18.4 → 0.18.5
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/cli/main.d.ts +1 -1
- package/dist/core/atomic-core.d.ts +1 -1
- package/dist/host/recipes/executor-io-windows.d.ts +10 -1
- package/dist/host/recipes/executor-io-windows.js +9 -3
- package/dist/host/recipes/executor-io-windows.js.map +1 -1
- package/dist/runtime/environment/host-exec.d.ts +2 -0
- package/dist/runtime/environment/host-exec.js +15 -4
- package/dist/runtime/environment/host-exec.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/dist/cli/main.d.ts
CHANGED
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
* rest land with their phases.
|
|
7
7
|
*/
|
|
8
8
|
import type { CliIo } from './io.js';
|
|
9
|
-
export declare const USAGE = "atomic-chat-core 0.18.
|
|
9
|
+
export declare const USAGE = "atomic-chat-core 0.18.5\n\nUsage: atomic-chat-core <command> [options]\n\nCommands:\n serve <model> Load a model in the core and expose it over an OpenAI-compatible API\n models list List the chat models installed in the CLI data folder\n server status Report whether a local API server is reachable\n daemon Run the core that owns this data folder (started for you by other commands)\n shutdown Stop the core that owns this data folder\n launch <agent> Start a model and launch a coding agent already wired to it\n providers List, register or remove cloud providers the API server routes to\n auth chatgpt Connect, inspect or disconnect a ChatGPT subscription\n telemetry Show, or turn on or off, the core's anonymous crash and error reports\n hardware info The machine as the core sees it: CPU flags, GPUs, drivers (--refresh, --json)\n backends list | recommend | updates \u2014 what fits this machine, what the core recommends,\n whether a newer build is published (--provider, --current, --force, --mode, --json)\n\nCommon options:\n --data-folder <path> Data folder to work with (default: <system data>/atomic-chat-cli/data)\n -h, --help Show this help\n -v, --version Print the version\n\nServe compatibility options:\n --model-path <gguf> Serve a GGUF directly; model id defaults to its filename\n --provider <id> llamacpp-upstream (default), mlx or foundation-models\n --resources-dir <dir> Folder with the desktop app's sidecar servers (mlx-server, foundation-models-server)\n --bin <path> Use this llama-server (or sidecar server) executable\n --port <port> Public OpenAI API port (default: 6767; 0 = random)\n --mmproj <path> Vision projector path\n --embedding Start in embedding mode\n --timeout <seconds> Readiness timeout (default: 120)\n --n-gpu-layers <n> GPU layers (-1 = all; default: -1)\n --ctx-size <tokens> Context size (default: 32768)\n --fit Let llama.cpp choose context size for available memory\n --threads <n> CPU inference threads (0 = auto)\n --api-key <key> Require this key on the public API\n --standalone Run a foreground owner in an explicit, separate --data-folder\n -d, --detach Compatibility flag; the persistent owner is already detached\n --log <path> Append llama.cpp stdout/stderr to a file\n -v, --verbose Relay llama.cpp output while the model loads\n --json Print the result as JSON\n\nNotes:\n The core keeps running when a command exits, so a model stays loaded between commands and\n Ctrl+C detaches instead of unloading. Stop it explicitly with `atomic-chat-core shutdown`.\n";
|
|
10
10
|
export declare function runCli(argv: string[], io: CliIo): Promise<number>;
|
|
@@ -77,7 +77,7 @@ export interface AtomicCoreParts {
|
|
|
77
77
|
telemetry?: TelemetryControl | undefined;
|
|
78
78
|
}
|
|
79
79
|
export declare class AtomicCore {
|
|
80
|
-
readonly version = "0.18.
|
|
80
|
+
readonly version = "0.18.5";
|
|
81
81
|
private lifecycle;
|
|
82
82
|
private shutdownPromise;
|
|
83
83
|
/** Whether the app's API screen is watching; previews are collected only then. */
|
|
@@ -41,7 +41,10 @@ export declare function judgeWindowsAcl(acl: WindowsAcl, what: string, expect: '
|
|
|
41
41
|
export declare function parseWindowsAcl(output: HostCommandOutput): WindowsAcl;
|
|
42
42
|
/** The calls this module makes, injectable so a test fakes owners and ACLs it cannot create. */
|
|
43
43
|
export interface WindowsHostStepIo {
|
|
44
|
-
/**
|
|
44
|
+
/**
|
|
45
|
+
* Runs one command, no shell; `env` is added to the inherited environment, and a name in it
|
|
46
|
+
* replaces the inherited one in any case.
|
|
47
|
+
*/
|
|
45
48
|
exec(command: string, args: string[], options?: {
|
|
46
49
|
timeoutMs?: number;
|
|
47
50
|
env?: Record<string, string>;
|
|
@@ -68,6 +71,12 @@ export interface WindowsHostStepIo {
|
|
|
68
71
|
* `%SystemRoot%`), the path in the environment, never in the script. Throws when PowerShell fails or
|
|
69
72
|
* answers without an owner. The host-step executor reads every ACL through it; `atc` checks its data
|
|
70
73
|
* folder with it (change close-cli-core-gaps, design D5).
|
|
74
|
+
*
|
|
75
|
+
* `PSModulePath` names Windows PowerShell's own modules folder alone, where `Get-Acl`'s module lives.
|
|
76
|
+
* Started from pwsh, a process inherits PowerShell 7's module path, whose copy of that module Windows
|
|
77
|
+
* PowerShell finds first and cannot load (`CouldNotAutoloadMatchingModule`); its default path holds
|
|
78
|
+
* every module installed for it, which a cold command lookup on a slow machine searches for tens of
|
|
79
|
+
* seconds.
|
|
71
80
|
*/
|
|
72
81
|
export declare function readWindowsAcl(path: string, options: {
|
|
73
82
|
exec: WindowsHostStepIo['exec'];
|
|
@@ -100,15 +100,21 @@ export function parseWindowsAcl(output) {
|
|
|
100
100
|
* `%SystemRoot%`), the path in the environment, never in the script. Throws when PowerShell fails or
|
|
101
101
|
* answers without an owner. The host-step executor reads every ACL through it; `atc` checks its data
|
|
102
102
|
* folder with it (change close-cli-core-gaps, design D5).
|
|
103
|
+
*
|
|
104
|
+
* `PSModulePath` names Windows PowerShell's own modules folder alone, where `Get-Acl`'s module lives.
|
|
105
|
+
* Started from pwsh, a process inherits PowerShell 7's module path, whose copy of that module Windows
|
|
106
|
+
* PowerShell finds first and cannot load (`CouldNotAutoloadMatchingModule`); its default path holds
|
|
107
|
+
* every module installed for it, which a cold command lookup on a slow machine searches for tens of
|
|
108
|
+
* seconds.
|
|
103
109
|
*/
|
|
104
110
|
export async function readWindowsAcl(path, options) {
|
|
105
111
|
const systemRoot = (options.systemRoot ??
|
|
106
112
|
process.env['SystemRoot'] ??
|
|
107
113
|
process.env['SYSTEMROOT'] ??
|
|
108
114
|
'C:\\Windows').replace(/[\\/]+$/, '');
|
|
109
|
-
const
|
|
110
|
-
return parseWindowsAcl(await options.exec(powershell
|
|
111
|
-
env: { ATOMIC_HOST_STEP_PATH: path },
|
|
115
|
+
const home = `${systemRoot}\\System32\\WindowsPowerShell\\v1.0`;
|
|
116
|
+
return parseWindowsAcl(await options.exec(`${home}\\powershell.exe`, ['-NoProfile', '-NonInteractive', '-Command', ACL_QUERY], {
|
|
117
|
+
env: { PSModulePath: `${home}\\Modules`, ATOMIC_HOST_STEP_PATH: path },
|
|
112
118
|
}));
|
|
113
119
|
}
|
|
114
120
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor-io-windows.js","sourceRoot":"","sources":["../../../src/host/recipes/executor-io-windows.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAkBrG,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,cAAc,GAAG,cAAc,CAAA;AACrC,MAAM,aAAa,GAAG,SAAS,CAAA;AAC/B,2EAA2E;AAC3E,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC;IACpB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,sBAAsB;IAClC,cAAc,EAAE,QAAQ;IACxB,cAAc,EAAE,SAAS;IACzB,SAAS,EAAE,cAAc;IACzB,SAAS,EAAE,YAAY;CACxB,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,YAAY,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;AAE5G,yEAAyE;AACzE,MAAM,UAAU,eAAe,CAAC,GAAe,EAAE,IAAY,EAAE,MAA4B;IACzF,IAAI,GAAG,CAAC,OAAO;QAAE,OAAO,GAAG,IAAI,uDAAuD,CAAA;IACtF,IAAI,GAAG,CAAC,SAAS,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC;QAAE,OAAO,GAAG,IAAI,aAAa,MAAM,EAAE,CAAA;IACnF,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,IAAI,gBAAgB,GAAG,CAAC,KAAK,6BAA6B,CAAA;IAC9F,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC,CAAA;IAC3E,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK;SACtB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC5F,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC1B,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,mBAAmB,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;AACnG,CAAC;AAED,MAAM,SAAS,GAAG;IAChB,iCAAiC;IACjC,sCAAsC;IACtC,8BAA8B;IAC9B,qDAAqD;IACrD,oBAAoB;IACpB,kFAAkF;IAClF,sCAAsC;IACtC,iCAAiC;IACjC,oEAAoE;IACpE,+IAA+I;IAC/I,uCAAuC;CACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAEZ,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,MAAyB;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAC1G,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAA8C,CAAA;IAClF,MAAM,KAAK,GAAG,CACZ,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAC9D,CAAA;IACrB,IACE,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;QAC7B,OAAO,GAAG,CAAC,OAAO,KAAK,SAAS;QAChC,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,EAClC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;IACtD,CAAC;IACD,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1B,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI;YAC1B,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SAC5B,CAAC,CAAC;KACJ,CAAA;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"executor-io-windows.js","sourceRoot":"","sources":["../../../src/host/recipes/executor-io-windows.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,8 @@ export interface HostExecOptions {
|
|
|
33
33
|
terminateGraceMs?: number;
|
|
34
34
|
/** Tests only: stands in for `child_process.spawn`. */
|
|
35
35
|
spawnProcess?: typeof spawn;
|
|
36
|
+
/** Tests only: whose rules for environment names apply (case-insensitive on `win32`). */
|
|
37
|
+
platform?: NodeJS.Platform;
|
|
36
38
|
}
|
|
37
39
|
export type HostExec = (command: string, args: string[], env?: Record<string, string | undefined>) => Promise<CommandOutput>;
|
|
38
40
|
export declare function hostExec(options?: HostExecOptions): HostExec;
|
|
@@ -31,13 +31,22 @@ const KILL_SETTLE_MS = 5_000;
|
|
|
31
31
|
* strips it, and every other key of `base` passes through untouched. This is the "merge, not
|
|
32
32
|
* replace" semantics `LinuxProbeDeps.exec`'s own `env` parameter documents (round 2, item 10): a
|
|
33
33
|
* caller stripping `DOCKER_HOST` for one call must not also lose `PATH` for it.
|
|
34
|
+
*
|
|
35
|
+
* On Windows a name means the same in any case, so an overlaid key replaces or strips the base's
|
|
36
|
+
* key in every case. Otherwise `spawn` would get both, and Node passes on only the first of them in
|
|
37
|
+
* sorted order — `PSMODULEPATH` before `PSModulePath`, the inherited one over the caller's.
|
|
34
38
|
*/
|
|
35
|
-
function overlayEnv(base, overlay) {
|
|
39
|
+
function overlayEnv(base, overlay, windows) {
|
|
36
40
|
const merged = { ...base };
|
|
37
41
|
for (const [key, value] of Object.entries(overlay)) {
|
|
38
|
-
if (
|
|
39
|
-
|
|
42
|
+
if (windows) {
|
|
43
|
+
for (const name of Object.keys(merged))
|
|
44
|
+
if (name.toUpperCase() === key.toUpperCase())
|
|
45
|
+
delete merged[name];
|
|
46
|
+
}
|
|
40
47
|
else
|
|
48
|
+
delete merged[key];
|
|
49
|
+
if (value !== undefined)
|
|
41
50
|
merged[key] = value;
|
|
42
51
|
}
|
|
43
52
|
return merged;
|
|
@@ -95,7 +104,9 @@ export function hostExec(options = {}) {
|
|
|
95
104
|
};
|
|
96
105
|
// No overlay for this call and no configured base: `spawn` gets no `env` key at all, which is
|
|
97
106
|
// how Node inherits `process.env` on its own — the same as before this parameter existed.
|
|
98
|
-
const spawnEnv = envOverlay === undefined
|
|
107
|
+
const spawnEnv = envOverlay === undefined
|
|
108
|
+
? options.env
|
|
109
|
+
: overlayEnv(options.env ?? process.env, envOverlay, (options.platform ?? process.platform) === 'win32');
|
|
99
110
|
try {
|
|
100
111
|
child = (options.spawnProcess ?? spawn)(command, args, {
|
|
101
112
|
shell: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-exec.js","sourceRoot":"","sources":["../../../src/runtime/environment/host-exec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"host-exec.js","sourceRoot":"","sources":["../../../src/runtime/environment/host-exec.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/** Kept in sync with package.json by `src/version.test.ts`. Bump both together. */
|
|
2
|
-
export declare const CORE_VERSION = "0.18.
|
|
2
|
+
export declare const CORE_VERSION = "0.18.5";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atomic-chat/core",
|
|
3
|
-
"version": "0.18.
|
|
3
|
+
"version": "0.18.5",
|
|
4
4
|
"description": "Inference core of Atomic Chat: local llama.cpp/MLX/Foundation Models runtime, cloud providers, model router and the OpenAI-compatible server on :1337.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|