@celljs/ta-host 4.5.1 → 4.6.0
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 +31 -8
- package/cell.schema.json +18 -0
- package/cell.yml +4 -0
- package/esm/node/auth-server-impl.d.ts +61 -0
- package/esm/node/auth-server-impl.js +247 -0
- package/esm/node/auth-server-impl.js.map +1 -0
- package/esm/node/client-tool-broker.d.ts +35 -0
- package/esm/node/client-tool-broker.js +82 -0
- package/esm/node/client-tool-broker.js.map +1 -0
- package/esm/node/exec-environment-factory.d.ts +17 -0
- package/esm/node/exec-environment-factory.js +58 -0
- package/esm/node/exec-environment-factory.js.map +1 -0
- package/esm/node/extension-data-notifier.d.ts +41 -0
- package/esm/node/extension-data-notifier.js +119 -0
- package/esm/node/extension-data-notifier.js.map +1 -0
- package/esm/node/extension-data.d.ts +45 -0
- package/esm/node/extension-data.js +181 -0
- package/esm/node/extension-data.js.map +1 -0
- package/esm/node/host-protocol.d.ts +29 -1
- package/esm/node/host-protocol.js +2 -0
- package/esm/node/host-protocol.js.map +1 -1
- package/esm/node/index.d.ts +24 -1
- package/esm/node/index.js +24 -1
- package/esm/node/index.js.map +1 -1
- package/esm/node/package-host-extension.d.ts +9 -0
- package/esm/node/package-host-extension.js +18 -0
- package/esm/node/package-host-extension.js.map +1 -0
- package/esm/node/package-hosts.d.ts +44 -0
- package/esm/node/package-hosts.js +167 -0
- package/esm/node/package-hosts.js.map +1 -0
- package/esm/node/package-server-impl.d.ts +25 -0
- package/esm/node/package-server-impl.js +94 -0
- package/esm/node/package-server-impl.js.map +1 -0
- package/esm/node/package-switch.d.ts +29 -0
- package/esm/node/package-switch.js +68 -0
- package/esm/node/package-switch.js.map +1 -0
- package/esm/node/relay-bridge.d.ts +34 -0
- package/esm/node/relay-bridge.js +105 -0
- package/esm/node/relay-bridge.js.map +1 -0
- package/esm/node/session-info-util.d.ts +16 -0
- package/esm/node/session-info-util.js +49 -0
- package/esm/node/session-info-util.js.map +1 -0
- package/esm/node/session-storage/file-session-storage.d.ts +27 -0
- package/esm/node/session-storage/file-session-storage.js +139 -0
- package/esm/node/session-storage/file-session-storage.js.map +1 -0
- package/esm/node/session-storage/index.d.ts +3 -0
- package/esm/node/session-storage/index.js +4 -0
- package/esm/node/session-storage/index.js.map +1 -0
- package/esm/node/session-storage/session-storage-protocol.d.ts +57 -0
- package/esm/node/session-storage/session-storage-protocol.js +40 -0
- package/esm/node/session-storage/session-storage-protocol.js.map +1 -0
- package/esm/node/session-storage/stored-session.d.ts +46 -0
- package/esm/node/session-storage/stored-session.js +116 -0
- package/esm/node/session-storage/stored-session.js.map +1 -0
- package/esm/node/settings-server-impl.d.ts +11 -0
- package/esm/node/settings-server-impl.js +45 -0
- package/esm/node/settings-server-impl.js.map +1 -0
- package/esm/node/settings-store.d.ts +56 -0
- package/esm/node/settings-store.js +306 -0
- package/esm/node/settings-store.js.map +1 -0
- package/esm/node/ta-access.d.ts +19 -2
- package/esm/node/ta-access.js +64 -7
- package/esm/node/ta-access.js.map +1 -1
- package/esm/node/ta-errors.d.ts +3 -1
- package/esm/node/ta-errors.js +17 -1
- package/esm/node/ta-errors.js.map +1 -1
- package/esm/node/ta-server-impl.d.ts +17 -5
- package/esm/node/ta-server-impl.js +70 -13
- package/esm/node/ta-server-impl.js.map +1 -1
- package/esm/node/ta-session-factory.d.ts +2 -0
- package/esm/node/ta-session-factory.js +25 -11
- package/esm/node/ta-session-factory.js.map +1 -1
- package/esm/node/ta-session.d.ts +9 -1
- package/esm/node/ta-session.js +26 -2
- package/esm/node/ta-session.js.map +1 -1
- package/esm/node/terminal-protocol.d.ts +18 -0
- package/esm/node/terminal-protocol.js +2 -0
- package/esm/node/terminal-protocol.js.map +1 -0
- package/esm/node/terminal-service.d.ts +59 -0
- package/esm/node/terminal-service.js +240 -0
- package/esm/node/terminal-service.js.map +1 -0
- package/esm/node/terminal-util.d.ts +62 -0
- package/esm/node/terminal-util.js +153 -0
- package/esm/node/terminal-util.js.map +1 -0
- package/esm/node/web-extension-catalog.d.ts +38 -0
- package/esm/node/web-extension-catalog.js +160 -0
- package/esm/node/web-extension-catalog.js.map +1 -0
- package/esm/node/web-extension-util.d.ts +21 -0
- package/esm/node/web-extension-util.js +123 -0
- package/esm/node/web-extension-util.js.map +1 -0
- package/esm/node/working-directory.d.ts +13 -0
- package/esm/node/working-directory.js +40 -0
- package/esm/node/working-directory.js.map +1 -0
- package/esm/node/workspace-files.d.ts +47 -0
- package/esm/node/workspace-files.js +265 -0
- package/esm/node/workspace-files.js.map +1 -0
- package/esm/node/workspace-protocol.d.ts +20 -0
- package/esm/node/workspace-protocol.js +3 -0
- package/esm/node/workspace-protocol.js.map +1 -0
- package/esm/node/workspace-server-impl.d.ts +27 -0
- package/esm/node/workspace-server-impl.js +88 -0
- package/esm/node/workspace-server-impl.js.map +1 -0
- package/esm/node/workspace-service.d.ts +31 -0
- package/esm/node/workspace-service.js +209 -0
- package/esm/node/workspace-service.js.map +1 -0
- package/esm/node/workspace-util.d.ts +29 -0
- package/esm/node/workspace-util.js +104 -0
- package/esm/node/workspace-util.js.map +1 -0
- package/lib/node/auth-server-impl.d.ts +62 -0
- package/lib/node/auth-server-impl.d.ts.map +1 -0
- package/lib/node/auth-server-impl.js +250 -0
- package/lib/node/auth-server-impl.js.map +1 -0
- package/lib/node/auth-server-impl.spec.d.ts +2 -0
- package/lib/node/auth-server-impl.spec.d.ts.map +1 -0
- package/lib/node/auth-server-impl.spec.js +47 -0
- package/lib/node/auth-server-impl.spec.js.map +1 -0
- package/lib/node/client-tool-broker.d.ts +36 -0
- package/lib/node/client-tool-broker.d.ts.map +1 -0
- package/lib/node/client-tool-broker.js +86 -0
- package/lib/node/client-tool-broker.js.map +1 -0
- package/lib/node/client-tool-broker.spec.d.ts +2 -0
- package/lib/node/client-tool-broker.spec.d.ts.map +1 -0
- package/lib/node/client-tool-broker.spec.js +49 -0
- package/lib/node/client-tool-broker.spec.js.map +1 -0
- package/lib/node/exec-environment-factory.d.ts +18 -0
- package/lib/node/exec-environment-factory.d.ts.map +1 -0
- package/lib/node/exec-environment-factory.js +61 -0
- package/lib/node/exec-environment-factory.js.map +1 -0
- package/lib/node/extension-data-notifier.d.ts +42 -0
- package/lib/node/extension-data-notifier.d.ts.map +1 -0
- package/lib/node/extension-data-notifier.js +123 -0
- package/lib/node/extension-data-notifier.js.map +1 -0
- package/lib/node/extension-data-notifier.spec.d.ts +2 -0
- package/lib/node/extension-data-notifier.spec.d.ts.map +1 -0
- package/lib/node/extension-data-notifier.spec.js +35 -0
- package/lib/node/extension-data-notifier.spec.js.map +1 -0
- package/lib/node/extension-data.d.ts +46 -0
- package/lib/node/extension-data.d.ts.map +1 -0
- package/lib/node/extension-data.js +184 -0
- package/lib/node/extension-data.js.map +1 -0
- package/lib/node/extension-data.spec.d.ts +2 -0
- package/lib/node/extension-data.spec.d.ts.map +1 -0
- package/lib/node/extension-data.spec.js +99 -0
- package/lib/node/extension-data.spec.js.map +1 -0
- package/lib/node/host-protocol.d.ts +29 -1
- package/lib/node/host-protocol.d.ts.map +1 -1
- package/lib/node/host-protocol.js +3 -1
- package/lib/node/host-protocol.js.map +1 -1
- package/lib/node/index.d.ts +24 -1
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +24 -1
- package/lib/node/index.js.map +1 -1
- package/lib/node/package-host-extension.d.ts +10 -0
- package/lib/node/package-host-extension.d.ts.map +1 -0
- package/lib/node/package-host-extension.js +22 -0
- package/lib/node/package-host-extension.js.map +1 -0
- package/lib/node/package-hosts.d.ts +45 -0
- package/lib/node/package-hosts.d.ts.map +1 -0
- package/lib/node/package-hosts.js +170 -0
- package/lib/node/package-hosts.js.map +1 -0
- package/lib/node/package-hosts.spec.d.ts +2 -0
- package/lib/node/package-hosts.spec.d.ts.map +1 -0
- package/lib/node/package-hosts.spec.js +53 -0
- package/lib/node/package-hosts.spec.js.map +1 -0
- package/lib/node/package-server-impl.d.ts +26 -0
- package/lib/node/package-server-impl.d.ts.map +1 -0
- package/lib/node/package-server-impl.js +97 -0
- package/lib/node/package-server-impl.js.map +1 -0
- package/lib/node/package-switch.d.ts +30 -0
- package/lib/node/package-switch.d.ts.map +1 -0
- package/lib/node/package-switch.js +71 -0
- package/lib/node/package-switch.js.map +1 -0
- package/lib/node/relay-bridge.d.ts +35 -0
- package/lib/node/relay-bridge.d.ts.map +1 -0
- package/lib/node/relay-bridge.js +108 -0
- package/lib/node/relay-bridge.js.map +1 -0
- package/lib/node/session-info-util.d.ts +17 -0
- package/lib/node/session-info-util.d.ts.map +1 -0
- package/lib/node/session-info-util.js +52 -0
- package/lib/node/session-info-util.js.map +1 -0
- package/lib/node/session-info-util.spec.d.ts +2 -0
- package/lib/node/session-info-util.spec.d.ts.map +1 -0
- package/lib/node/session-info-util.spec.js +22 -0
- package/lib/node/session-info-util.spec.js.map +1 -0
- package/lib/node/session-storage/file-session-storage.d.ts +28 -0
- package/lib/node/session-storage/file-session-storage.d.ts.map +1 -0
- package/lib/node/session-storage/file-session-storage.js +143 -0
- package/lib/node/session-storage/file-session-storage.js.map +1 -0
- package/lib/node/session-storage/file-session-storage.spec.d.ts +2 -0
- package/lib/node/session-storage/file-session-storage.spec.d.ts.map +1 -0
- package/lib/node/session-storage/file-session-storage.spec.js +70 -0
- package/lib/node/session-storage/file-session-storage.spec.js.map +1 -0
- package/lib/node/session-storage/index.d.ts +4 -0
- package/lib/node/session-storage/index.d.ts.map +1 -0
- package/lib/node/session-storage/index.js +20 -0
- package/lib/node/session-storage/index.js.map +1 -0
- package/lib/node/session-storage/session-storage-protocol.d.ts +58 -0
- package/lib/node/session-storage/session-storage-protocol.d.ts.map +1 -0
- package/lib/node/session-storage/session-storage-protocol.js +45 -0
- package/lib/node/session-storage/session-storage-protocol.js.map +1 -0
- package/lib/node/session-storage/stored-session.d.ts +47 -0
- package/lib/node/session-storage/stored-session.d.ts.map +1 -0
- package/lib/node/session-storage/stored-session.js +120 -0
- package/lib/node/session-storage/stored-session.js.map +1 -0
- package/lib/node/session-storage/stored-session.spec.d.ts +2 -0
- package/lib/node/session-storage/stored-session.spec.d.ts.map +1 -0
- package/lib/node/session-storage/stored-session.spec.js +73 -0
- package/lib/node/session-storage/stored-session.spec.js.map +1 -0
- package/lib/node/settings-server-impl.d.ts +12 -0
- package/lib/node/settings-server-impl.d.ts.map +1 -0
- package/lib/node/settings-server-impl.js +48 -0
- package/lib/node/settings-server-impl.js.map +1 -0
- package/lib/node/settings-store.d.ts +57 -0
- package/lib/node/settings-store.d.ts.map +1 -0
- package/lib/node/settings-store.js +309 -0
- package/lib/node/settings-store.js.map +1 -0
- package/lib/node/settings-store.spec.d.ts +2 -0
- package/lib/node/settings-store.spec.d.ts.map +1 -0
- package/lib/node/settings-store.spec.js +145 -0
- package/lib/node/settings-store.spec.js.map +1 -0
- package/lib/node/ta-access.d.ts +19 -2
- package/lib/node/ta-access.d.ts.map +1 -1
- package/lib/node/ta-access.js +66 -9
- package/lib/node/ta-access.js.map +1 -1
- package/lib/node/ta-access.spec.js +8 -0
- package/lib/node/ta-access.spec.js.map +1 -1
- package/lib/node/ta-errors.d.ts +3 -1
- package/lib/node/ta-errors.d.ts.map +1 -1
- package/lib/node/ta-errors.js +17 -1
- package/lib/node/ta-errors.js.map +1 -1
- package/lib/node/ta-errors.spec.d.ts +2 -0
- package/lib/node/ta-errors.spec.d.ts.map +1 -0
- package/lib/node/ta-errors.spec.js +25 -0
- package/lib/node/ta-errors.spec.js.map +1 -0
- package/lib/node/ta-server-impl.d.ts +17 -5
- package/lib/node/ta-server-impl.d.ts.map +1 -1
- package/lib/node/ta-server-impl.js +70 -13
- package/lib/node/ta-server-impl.js.map +1 -1
- package/lib/node/ta-session-factory.d.ts +2 -0
- package/lib/node/ta-session-factory.d.ts.map +1 -1
- package/lib/node/ta-session-factory.js +24 -10
- package/lib/node/ta-session-factory.js.map +1 -1
- package/lib/node/ta-session.d.ts +9 -1
- package/lib/node/ta-session.d.ts.map +1 -1
- package/lib/node/ta-session.js +26 -2
- package/lib/node/ta-session.js.map +1 -1
- package/lib/node/terminal-protocol.d.ts +19 -0
- package/lib/node/terminal-protocol.d.ts.map +1 -0
- package/lib/node/terminal-protocol.js +5 -0
- package/lib/node/terminal-protocol.js.map +1 -0
- package/lib/node/terminal-service.d.ts +60 -0
- package/lib/node/terminal-service.d.ts.map +1 -0
- package/lib/node/terminal-service.js +241 -0
- package/lib/node/terminal-service.js.map +1 -0
- package/lib/node/terminal-service.spec.d.ts +2 -0
- package/lib/node/terminal-service.spec.d.ts.map +1 -0
- package/lib/node/terminal-service.spec.js +79 -0
- package/lib/node/terminal-service.spec.js.map +1 -0
- package/lib/node/terminal-util.d.ts +63 -0
- package/lib/node/terminal-util.d.ts.map +1 -0
- package/lib/node/terminal-util.js +158 -0
- package/lib/node/terminal-util.js.map +1 -0
- package/lib/node/terminal-util.spec.d.ts +2 -0
- package/lib/node/terminal-util.spec.d.ts.map +1 -0
- package/lib/node/terminal-util.spec.js +71 -0
- package/lib/node/terminal-util.spec.js.map +1 -0
- package/lib/node/web-extension-catalog.d.ts +39 -0
- package/lib/node/web-extension-catalog.d.ts.map +1 -0
- package/lib/node/web-extension-catalog.js +163 -0
- package/lib/node/web-extension-catalog.js.map +1 -0
- package/lib/node/web-extension-catalog.spec.d.ts +2 -0
- package/lib/node/web-extension-catalog.spec.d.ts.map +1 -0
- package/lib/node/web-extension-catalog.spec.js +157 -0
- package/lib/node/web-extension-catalog.spec.js.map +1 -0
- package/lib/node/web-extension-util.d.ts +22 -0
- package/lib/node/web-extension-util.d.ts.map +1 -0
- package/lib/node/web-extension-util.js +126 -0
- package/lib/node/web-extension-util.js.map +1 -0
- package/lib/node/working-directory.d.ts +14 -0
- package/lib/node/working-directory.d.ts.map +1 -0
- package/lib/node/working-directory.js +43 -0
- package/lib/node/working-directory.js.map +1 -0
- package/lib/node/workspace-files.d.ts +48 -0
- package/lib/node/workspace-files.d.ts.map +1 -0
- package/lib/node/workspace-files.js +268 -0
- package/lib/node/workspace-files.js.map +1 -0
- package/lib/node/workspace-files.spec.d.ts +2 -0
- package/lib/node/workspace-files.spec.d.ts.map +1 -0
- package/lib/node/workspace-files.spec.js +133 -0
- package/lib/node/workspace-files.spec.js.map +1 -0
- package/lib/node/workspace-protocol.d.ts +21 -0
- package/lib/node/workspace-protocol.d.ts.map +1 -0
- package/lib/node/workspace-protocol.js +6 -0
- package/lib/node/workspace-protocol.js.map +1 -0
- package/lib/node/workspace-server-impl.d.ts +28 -0
- package/lib/node/workspace-server-impl.d.ts.map +1 -0
- package/lib/node/workspace-server-impl.js +91 -0
- package/lib/node/workspace-server-impl.js.map +1 -0
- package/lib/node/workspace-service.d.ts +32 -0
- package/lib/node/workspace-service.d.ts.map +1 -0
- package/lib/node/workspace-service.js +212 -0
- package/lib/node/workspace-service.js.map +1 -0
- package/lib/node/workspace-service.spec.d.ts +2 -0
- package/lib/node/workspace-service.spec.d.ts.map +1 -0
- package/lib/node/workspace-service.spec.js +104 -0
- package/lib/node/workspace-service.spec.js.map +1 -0
- package/lib/node/workspace-util.d.ts +30 -0
- package/lib/node/workspace-util.d.ts.map +1 -0
- package/lib/node/workspace-util.js +107 -0
- package/lib/node/workspace-util.js.map +1 -0
- package/lib/node/workspace-util.spec.d.ts +2 -0
- package/lib/node/workspace-util.spec.d.ts.map +1 -0
- package/lib/node/workspace-util.spec.js +44 -0
- package/lib/node/workspace-util.spec.js.map +1 -0
- package/package.json +14 -9
- package/src/node/auth-server-impl.spec.ts +49 -0
- package/src/node/auth-server-impl.ts +252 -0
- package/src/node/client-tool-broker.spec.ts +53 -0
- package/src/node/client-tool-broker.ts +106 -0
- package/src/node/exec-environment-factory.ts +46 -0
- package/src/node/extension-data-notifier.spec.ts +34 -0
- package/src/node/extension-data-notifier.ts +124 -0
- package/src/node/extension-data.spec.ts +105 -0
- package/src/node/extension-data.ts +180 -0
- package/src/node/host-protocol.ts +31 -1
- package/src/node/index.ts +24 -1
- package/src/node/package-host-extension.ts +20 -0
- package/src/node/package-hosts.spec.ts +54 -0
- package/src/node/package-hosts.ts +174 -0
- package/src/node/package-server-impl.ts +87 -0
- package/src/node/package-switch.ts +80 -0
- package/src/node/relay-bridge.ts +94 -0
- package/src/node/session-info-util.spec.ts +23 -0
- package/src/node/session-info-util.ts +55 -0
- package/src/node/session-storage/file-session-storage.spec.ts +72 -0
- package/src/node/session-storage/file-session-storage.ts +145 -0
- package/src/node/session-storage/index.ts +3 -0
- package/src/node/session-storage/session-storage-protocol.ts +81 -0
- package/src/node/session-storage/stored-session.spec.ts +80 -0
- package/src/node/session-storage/stored-session.ts +149 -0
- package/src/node/settings-server-impl.ts +33 -0
- package/src/node/settings-store.spec.ts +155 -0
- package/src/node/settings-store.ts +308 -0
- package/src/node/ta-access.spec.ts +9 -0
- package/src/node/ta-access.ts +65 -7
- package/src/node/ta-errors.spec.ts +25 -0
- package/src/node/ta-errors.ts +21 -1
- package/src/node/ta-server-impl.ts +75 -12
- package/src/node/ta-session-factory.ts +21 -7
- package/src/node/ta-session.ts +43 -3
- package/src/node/terminal-protocol.ts +18 -0
- package/src/node/terminal-service.spec.ts +84 -0
- package/src/node/terminal-service.ts +259 -0
- package/src/node/terminal-util.spec.ts +78 -0
- package/src/node/terminal-util.ts +166 -0
- package/src/node/web-extension-catalog.spec.ts +172 -0
- package/src/node/web-extension-catalog.ts +172 -0
- package/src/node/web-extension-util.ts +144 -0
- package/src/node/working-directory.ts +38 -0
- package/src/node/workspace-files.spec.ts +145 -0
- package/src/node/workspace-files.ts +256 -0
- package/src/node/workspace-protocol.ts +22 -0
- package/src/node/workspace-server-impl.ts +90 -0
- package/src/node/workspace-service.spec.ts +113 -0
- package/src/node/workspace-service.ts +223 -0
- package/src/node/workspace-util.spec.ts +47 -0
- package/src/node/workspace-util.ts +103 -0
- package/esm/node/local-exec-environment-factory.d.ts +0 -4
- package/esm/node/local-exec-environment-factory.js +0 -18
- package/esm/node/local-exec-environment-factory.js.map +0 -1
- package/lib/node/local-exec-environment-factory.d.ts +0 -5
- package/lib/node/local-exec-environment-factory.d.ts.map +0 -1
- package/lib/node/local-exec-environment-factory.js +0 -21
- package/lib/node/local-exec-environment-factory.js.map +0 -1
- package/src/node/local-exec-environment-factory.ts +0 -9
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const node_os_1 = require("node:os");
|
|
6
|
+
const node_path_1 = require("node:path");
|
|
7
|
+
const ai_coding_agent_1 = require("@celljs/ai-coding-agent");
|
|
8
|
+
const settings_store_1 = require("./settings-store");
|
|
9
|
+
(0, bun_test_1.describe)('TaSettingsUtil', () => {
|
|
10
|
+
(0, bun_test_1.it)('reads the settings ta changes, the model from its two keys, and leaves out values pi would not take', () => {
|
|
11
|
+
const file = {
|
|
12
|
+
defaultProvider: 'anthropic',
|
|
13
|
+
defaultModel: 'claude/x',
|
|
14
|
+
compaction: { enabled: false, reserveTokens: -1 },
|
|
15
|
+
transport: 'pigeon',
|
|
16
|
+
theme: 'dark',
|
|
17
|
+
};
|
|
18
|
+
(0, bun_test_1.expect)(settings_store_1.TaSettingsUtil.read(file)).toEqual({ model: 'anthropic/claude/x', 'compaction.enabled': false });
|
|
19
|
+
});
|
|
20
|
+
(0, bun_test_1.it)('changes keys and keeps the others; null removes a key and the objects it leaves empty', () => {
|
|
21
|
+
const file = { theme: 'dark', compaction: { enabled: false }, defaultProvider: 'a', defaultModel: 'b' };
|
|
22
|
+
const next = settings_store_1.TaSettingsUtil.apply(file, { 'compaction.enabled': null, 'retry.maxRetries': 5, model: 'openai/gpt-5' });
|
|
23
|
+
(0, bun_test_1.expect)(next).toEqual({ theme: 'dark', retry: { maxRetries: 5 }, defaultProvider: 'openai', defaultModel: 'gpt-5' });
|
|
24
|
+
(0, bun_test_1.expect)(file.compaction.enabled).toBe(false);
|
|
25
|
+
(0, bun_test_1.expect)(settings_store_1.TaSettingsUtil.apply(next, { model: null })).toEqual({ theme: 'dark', retry: { maxRetries: 5 } });
|
|
26
|
+
});
|
|
27
|
+
(0, bun_test_1.it)('refuses keys it does not know and values that are not of the setting', () => {
|
|
28
|
+
(0, bun_test_1.expect)(() => settings_store_1.TaSettingsUtil.apply({}, { theme: 'dark' })).toThrow('not a setting clients change');
|
|
29
|
+
(0, bun_test_1.expect)(() => settings_store_1.TaSettingsUtil.apply({}, { transport: 'pigeon' })).toThrow('not a value of transport');
|
|
30
|
+
(0, bun_test_1.expect)(() => settings_store_1.TaSettingsUtil.apply({}, { 'retry.maxRetries': 1.5 })).toThrow('not a value of retry.maxRetries');
|
|
31
|
+
(0, bun_test_1.expect)(() => settings_store_1.TaSettingsUtil.apply({}, { model: 'no-provider' })).toThrow('not a value of model');
|
|
32
|
+
(0, bun_test_1.expect)(settings_store_1.TaSettingsUtil.apply({ shellPath: '/bin/zsh' }, { shellPath: ' ' })).toEqual({});
|
|
33
|
+
});
|
|
34
|
+
(0, bun_test_1.it)('does not overwrite a file it cannot read', () => {
|
|
35
|
+
(0, bun_test_1.expect)(settings_store_1.TaSettingsUtil.parse('', 'f')).toEqual({});
|
|
36
|
+
(0, bun_test_1.expect)(() => settings_store_1.TaSettingsUtil.parse('{', 'f')).toThrow('not valid JSON');
|
|
37
|
+
(0, bun_test_1.expect)(() => settings_store_1.TaSettingsUtil.parse('[]', 'f')).toThrow('JSON object');
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
(0, bun_test_1.describe)('TaSettingsStoreImpl', () => {
|
|
41
|
+
let root;
|
|
42
|
+
let agentDir;
|
|
43
|
+
let cwd;
|
|
44
|
+
let store;
|
|
45
|
+
/** `.ta` under ta, pi's own name in tests. */
|
|
46
|
+
let configDir;
|
|
47
|
+
const reloaded = [];
|
|
48
|
+
function session(dir) {
|
|
49
|
+
let trusted = false;
|
|
50
|
+
return {
|
|
51
|
+
runtime: { cwd: dir },
|
|
52
|
+
pi: {
|
|
53
|
+
settingsManager: {
|
|
54
|
+
isProjectTrusted: () => trusted,
|
|
55
|
+
setProjectTrusted: (value) => {
|
|
56
|
+
trusted = value;
|
|
57
|
+
},
|
|
58
|
+
reload: async () => {
|
|
59
|
+
reloaded.push(`${dir}:${trusted}`);
|
|
60
|
+
},
|
|
61
|
+
},
|
|
62
|
+
},
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
(0, bun_test_1.beforeEach)(async () => {
|
|
66
|
+
configDir = (await ai_coding_agent_1.PiSdkUtil.load()).CONFIG_DIR_NAME;
|
|
67
|
+
root = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'ta-settings-'));
|
|
68
|
+
agentDir = (0, node_path_1.join)(root, 'agent');
|
|
69
|
+
cwd = (0, node_path_1.join)(root, 'project');
|
|
70
|
+
(0, node_fs_1.mkdirSync)(agentDir);
|
|
71
|
+
(0, node_fs_1.mkdirSync)(cwd);
|
|
72
|
+
reloaded.length = 0;
|
|
73
|
+
store = new settings_store_1.TaSettingsStoreImpl();
|
|
74
|
+
Object.assign(store, {
|
|
75
|
+
codingAgentOptions: { agentDir },
|
|
76
|
+
modelRuntimeProvider: { provide: async () => ({ getAvailable: async () => [{ provider: 'fake', id: 'fake-1' }] }) },
|
|
77
|
+
sessions: { list: () => [session(cwd), session((0, node_path_1.join)(root, 'other'))] },
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
(0, bun_test_1.afterEach)(() => (0, node_fs_1.rmSync)(root, { recursive: true, force: true }));
|
|
81
|
+
(0, bun_test_1.it)('writes the settings of the user next to what the file had, and has every session read them again', async () => {
|
|
82
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(agentDir, 'settings.json'), JSON.stringify({ theme: 'dark', packages: ['npm:x'] }));
|
|
83
|
+
const snapshot = await store.update('user', { 'compaction.enabled': false, model: 'fake/fake-1' }, cwd);
|
|
84
|
+
(0, bun_test_1.expect)(snapshot.user).toEqual({ model: 'fake/fake-1', 'compaction.enabled': false });
|
|
85
|
+
(0, bun_test_1.expect)(snapshot.models).toEqual(['fake/fake-1']);
|
|
86
|
+
(0, bun_test_1.expect)(JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(agentDir, 'settings.json'), 'utf8'))).toEqual({
|
|
87
|
+
theme: 'dark',
|
|
88
|
+
packages: ['npm:x'],
|
|
89
|
+
compaction: { enabled: false },
|
|
90
|
+
defaultProvider: 'fake',
|
|
91
|
+
defaultModel: 'fake-1',
|
|
92
|
+
});
|
|
93
|
+
(0, bun_test_1.expect)(reloaded).toHaveLength(2);
|
|
94
|
+
});
|
|
95
|
+
(0, bun_test_1.it)('writes the settings of a project in its directory, trusts the project, and reloads only its sessions', async () => {
|
|
96
|
+
const first = await store.get(cwd);
|
|
97
|
+
(0, bun_test_1.expect)(first.projectTrusted).toBe(true);
|
|
98
|
+
(0, bun_test_1.expect)(first.projectFile).toBe((0, node_path_1.join)(cwd, configDir, 'settings.json'));
|
|
99
|
+
const snapshot = await store.update('project', { 'retry.enabled': false }, cwd);
|
|
100
|
+
(0, bun_test_1.expect)(snapshot.project).toEqual({ 'retry.enabled': false });
|
|
101
|
+
(0, bun_test_1.expect)(snapshot.projectTrusted).toBe(true);
|
|
102
|
+
(0, bun_test_1.expect)(reloaded).toEqual([`${cwd}:true`]);
|
|
103
|
+
(0, bun_test_1.expect)(Object.values(JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(agentDir, 'trust.json'), 'utf8')))).toEqual([true]);
|
|
104
|
+
});
|
|
105
|
+
(0, bun_test_1.it)('does not write the settings of a project the user has not trusted yet', async () => {
|
|
106
|
+
(0, node_fs_1.mkdirSync)((0, node_path_1.join)(cwd, configDir, 'extensions'), { recursive: true });
|
|
107
|
+
(0, bun_test_1.expect)((await store.get(cwd)).projectTrusted).toBe(false);
|
|
108
|
+
await (0, bun_test_1.expect)(store.update('project', { 'retry.enabled': false }, cwd)).rejects.toThrow('does not trust');
|
|
109
|
+
(0, bun_test_1.expect)((0, node_fs_1.existsSync)((0, node_path_1.join)(cwd, configDir, 'settings.json'))).toBe(false);
|
|
110
|
+
});
|
|
111
|
+
(0, bun_test_1.it)('keeps both of two changes made at once', async () => {
|
|
112
|
+
await Promise.all([store.update('user', { 'retry.enabled': false }, cwd), store.update('user', { 'retry.maxRetries': 7 }, cwd)]);
|
|
113
|
+
(0, bun_test_1.expect)((await store.get(cwd)).user).toEqual({ 'retry.enabled': false, 'retry.maxRetries': 7 });
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
(0, bun_test_1.describe)('SettingsLockUtil', () => {
|
|
117
|
+
let dir;
|
|
118
|
+
(0, bun_test_1.beforeEach)(() => {
|
|
119
|
+
dir = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'ta-settings-lock-'));
|
|
120
|
+
});
|
|
121
|
+
(0, bun_test_1.afterEach)(() => (0, node_fs_1.rmSync)(dir, { recursive: true, force: true }));
|
|
122
|
+
(0, bun_test_1.it)('holds the lock pi takes while it works, and lets it go after, also when the work fails', async () => {
|
|
123
|
+
const file = (0, node_path_1.join)(dir, 'agent/settings.json');
|
|
124
|
+
(0, bun_test_1.expect)(await settings_store_1.SettingsLockUtil.run(file, async () => (0, node_fs_1.existsSync)(`${file}.lock`))).toBe(true);
|
|
125
|
+
(0, bun_test_1.expect)((0, node_fs_1.existsSync)(`${file}.lock`)).toBe(false);
|
|
126
|
+
await (0, bun_test_1.expect)(settings_store_1.SettingsLockUtil.run(file, () => Promise.reject(new Error('broken')))).rejects.toThrow('broken');
|
|
127
|
+
(0, bun_test_1.expect)((0, node_fs_1.existsSync)(`${file}.lock`)).toBe(false);
|
|
128
|
+
});
|
|
129
|
+
(0, bun_test_1.it)('waits for a lock another process holds, and takes over one that is stale', async () => {
|
|
130
|
+
const file = (0, node_path_1.join)(dir, 'settings.json');
|
|
131
|
+
(0, node_fs_1.mkdirSync)(`${file}.lock`);
|
|
132
|
+
const order = [];
|
|
133
|
+
const waiting = settings_store_1.SettingsLockUtil.run(file, async () => void order.push('ta'));
|
|
134
|
+
await new Promise(resolve => setTimeout(resolve, 60));
|
|
135
|
+
order.push('other');
|
|
136
|
+
(0, node_fs_1.rmSync)(`${file}.lock`, { recursive: true });
|
|
137
|
+
await waiting;
|
|
138
|
+
(0, bun_test_1.expect)(order).toEqual(['other', 'ta']);
|
|
139
|
+
(0, node_fs_1.mkdirSync)(`${file}.lock`);
|
|
140
|
+
const old = (Date.now() - settings_store_1.SettingsLockUtil.STALE_MS - 1000) / 1000;
|
|
141
|
+
(0, node_fs_1.utimesSync)(`${file}.lock`, old, old);
|
|
142
|
+
(0, bun_test_1.expect)(await settings_store_1.SettingsLockUtil.run(file, async () => 'taken')).toBe('taken');
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
//# sourceMappingURL=settings-store.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings-store.spec.js","sourceRoot":"","sources":["../../src/node/settings-store.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/node/ta-access.d.ts
CHANGED
|
@@ -3,16 +3,33 @@ import { type Application, ApplicationLifecycle } from '@celljs/core';
|
|
|
3
3
|
import { RpcWebSocketGuard } from '@celljs/rpc/lib/node';
|
|
4
4
|
import { type Context, Middleware, ServerAware } from '@celljs/web/lib/node';
|
|
5
5
|
import { TaSessionRegistry } from './host-protocol';
|
|
6
|
+
/** The id of {@link TaAccess}, for what needs the token, as RelayBridge does. */
|
|
7
|
+
export declare const TA_ACCESS: unique symbol;
|
|
8
|
+
/** Runs before everything else that handles a request. */
|
|
9
|
+
export declare const ACCESS_MIDDLEWARE_PRIORITY = 10000;
|
|
6
10
|
export declare namespace TaAccessUtil {
|
|
7
11
|
/** From `Authorization: Bearer`, or `?token=` for browsers, whose WebSocket API cannot set headers. */
|
|
8
12
|
function tokenOf(request: IncomingMessage): string | undefined;
|
|
9
13
|
function equals(a: string, b: string): boolean;
|
|
10
14
|
/** A page that rebinds its domain to 127.0.0.1 reaches the server with its own name in `Host`. */
|
|
11
15
|
function isLoopbackHost(host: string | undefined): boolean;
|
|
16
|
+
/** The files of the web client are the same for everyone: they hold no data, so they need no token. */
|
|
17
|
+
function isPublic(request: IncomingMessage): boolean;
|
|
18
|
+
/**
|
|
19
|
+
* A JSON-RPC call over plain HTTP (`POST /api/<service>`), which @celljs/rpc answers too: ta serve takes
|
|
20
|
+
* calls on its WebSocket only, where a call knows its connection (attach, terminals) and gets pushes.
|
|
21
|
+
*/
|
|
22
|
+
function isHttpCall(request: IncomingMessage): boolean;
|
|
23
|
+
/** The token goes in the fragment, which the browser does not send to the server or in `Referer`. */
|
|
24
|
+
function webUrl(httpUrl: string, token: string): string;
|
|
25
|
+
/** Opens a URL in the user's browser. */
|
|
26
|
+
function openBrowser(url: string): void;
|
|
12
27
|
}
|
|
13
28
|
/**
|
|
14
|
-
* The token of this server: `TA_SERVE_TOKEN`, which a parent process (the desktop app) can choose, or
|
|
15
|
-
* random one. It lets in connections and requests, and is published in a file
|
|
29
|
+
* The token of this server: `TA_SERVE_TOKEN`, which a parent process (the desktop app) can choose, or the
|
|
30
|
+
* one of the last start, or a random one. It lets in connections and requests, and is published in a file
|
|
31
|
+
* only this user can read. It stays across restarts with the port (TaServeStateUtil), so that the web app
|
|
32
|
+
* installed from this address, which remembers both, signs in again by itself.
|
|
16
33
|
*/
|
|
17
34
|
export declare class TaAccess implements RpcWebSocketGuard, Middleware, ServerAware, ApplicationLifecycle<Application> {
|
|
18
35
|
readonly priority = 10000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-access.d.ts","sourceRoot":"","sources":["../../src/node/ta-access.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ta-access.d.ts","sourceRoot":"","sources":["../../src/node/ta-access.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,KAAK,WAAW,EAAE,oBAAoB,EAA+B,MAAM,cAAc,CAAC;AACnG,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIrE,OAAO,EAAE,KAAK,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAOpD,iFAAiF;AACjF,eAAO,MAAM,SAAS,eAAqB,CAAC;AAE5C,0DAA0D;AAC1D,eAAO,MAAM,0BAA0B,QAAQ,CAAC;AAEhD,yBAAiB,YAAY,CAAC;IAC1B,uGAAuG;IACvG,SAAgB,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAMpE;IAED,SAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAGpD;IAED,kGAAkG;IAClG,SAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEhE;IAED,uGAAuG;IACvG,SAAgB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAG1D;IAED;;;OAGG;IACH,SAAgB,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAG5D;IAED,qGAAqG;IACrG,SAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7D;IAED,yCAAyC;IACzC,SAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAM7C;CACJ;AAED;;;;;GAKG;AACH,qBACa,QAAS,YAAW,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,CAAC,WAAW,CAAC;IAC1G,QAAQ,CAAC,QAAQ,SAA8B;IAC/C,QAAQ,CAAC,KAAK,SAAwG;IAGtH,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAGjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IAE/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,SAA2C;IAEtE,MAAM,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAGxC;IAED,kFAAkF;IAC5E,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnE;IAEK,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO7C;IAEK,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAG5B;IAED,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEvD;IAED,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAiBtC;CACJ"}
|
package/lib/node/ta-access.js
CHANGED
|
@@ -9,19 +9,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.TaAccess = exports.TaAccessUtil = void 0;
|
|
12
|
+
exports.TaAccess = exports.TaAccessUtil = exports.ACCESS_MIDDLEWARE_PRIORITY = exports.TA_ACCESS = void 0;
|
|
13
|
+
const node_child_process_1 = require("node:child_process");
|
|
13
14
|
const node_crypto_1 = require("node:crypto");
|
|
14
15
|
const node_fs_1 = require("node:fs");
|
|
15
16
|
const node_path_1 = require("node:path");
|
|
16
17
|
const core_1 = require("@celljs/core");
|
|
17
18
|
const node_1 = require("@celljs/rpc/lib/node");
|
|
19
|
+
const serve_state_1 = require("@celljs/ta-harness/lib/node/serve-state");
|
|
18
20
|
const ta_brand_1 = require("@celljs/ta-harness/lib/node/ta-brand");
|
|
19
21
|
const ta_protocol_1 = require("@celljs/ta-protocol");
|
|
20
22
|
const node_2 = require("@celljs/web/lib/node");
|
|
21
23
|
const host_protocol_1 = require("./host-protocol");
|
|
22
24
|
const LOOPBACK_NAMES = new Set(['127.0.0.1', 'localhost', '[::1]']);
|
|
25
|
+
/** Where the calls go (`rpc.path`); everything else is the web client, if it is installed. */
|
|
26
|
+
const API_PATH = '/api';
|
|
27
|
+
/** The id of {@link TaAccess}, for what needs the token, as RelayBridge does. */
|
|
28
|
+
exports.TA_ACCESS = Symbol('TaAccess');
|
|
23
29
|
/** Runs before everything else that handles a request. */
|
|
24
|
-
|
|
30
|
+
exports.ACCESS_MIDDLEWARE_PRIORITY = 10000;
|
|
25
31
|
var TaAccessUtil;
|
|
26
32
|
(function (TaAccessUtil) {
|
|
27
33
|
/** From `Authorization: Bearer`, or `?token=` for browsers, whose WebSocket API cannot set headers. */
|
|
@@ -44,15 +50,47 @@ var TaAccessUtil;
|
|
|
44
50
|
return LOOPBACK_NAMES.has((host !== null && host !== void 0 ? host : '').replace(/:\d+$/, ''));
|
|
45
51
|
}
|
|
46
52
|
TaAccessUtil.isLoopbackHost = isLoopbackHost;
|
|
53
|
+
/** The files of the web client are the same for everyone: they hold no data, so they need no token. */
|
|
54
|
+
function isPublic(request) {
|
|
55
|
+
var _a;
|
|
56
|
+
const path = ((_a = request.url) !== null && _a !== void 0 ? _a : '/').split('?')[0];
|
|
57
|
+
return (request.method === 'GET' || request.method === 'HEAD') && path !== API_PATH && !path.startsWith(`${API_PATH}/`);
|
|
58
|
+
}
|
|
59
|
+
TaAccessUtil.isPublic = isPublic;
|
|
60
|
+
/**
|
|
61
|
+
* A JSON-RPC call over plain HTTP (`POST /api/<service>`), which @celljs/rpc answers too: ta serve takes
|
|
62
|
+
* calls on its WebSocket only, where a call knows its connection (attach, terminals) and gets pushes.
|
|
63
|
+
*/
|
|
64
|
+
function isHttpCall(request) {
|
|
65
|
+
var _a;
|
|
66
|
+
const path = ((_a = request.url) !== null && _a !== void 0 ? _a : '/').split('?')[0];
|
|
67
|
+
return request.method === 'POST' && path.startsWith(`${API_PATH}/`);
|
|
68
|
+
}
|
|
69
|
+
TaAccessUtil.isHttpCall = isHttpCall;
|
|
70
|
+
/** The token goes in the fragment, which the browser does not send to the server or in `Referer`. */
|
|
71
|
+
function webUrl(httpUrl, token) {
|
|
72
|
+
return `${httpUrl}/#token=${token}`;
|
|
73
|
+
}
|
|
74
|
+
TaAccessUtil.webUrl = webUrl;
|
|
75
|
+
/** Opens a URL in the user's browser. */
|
|
76
|
+
function openBrowser(url) {
|
|
77
|
+
const [command, ...args] = process.platform === 'darwin' ? ['open', url] : process.platform === 'win32' ? ['cmd', '/c', 'start', '""', url] : ['xdg-open', url];
|
|
78
|
+
const child = (0, node_child_process_1.spawn)(command, args, { stdio: 'ignore', detached: true });
|
|
79
|
+
child.on('error', () => console.log(`ta serve: open ${url} in a browser`));
|
|
80
|
+
child.unref();
|
|
81
|
+
}
|
|
82
|
+
TaAccessUtil.openBrowser = openBrowser;
|
|
47
83
|
})(TaAccessUtil || (exports.TaAccessUtil = TaAccessUtil = {}));
|
|
48
84
|
/**
|
|
49
|
-
* The token of this server: `TA_SERVE_TOKEN`, which a parent process (the desktop app) can choose, or
|
|
50
|
-
* random one. It lets in connections and requests, and is published in a file
|
|
85
|
+
* The token of this server: `TA_SERVE_TOKEN`, which a parent process (the desktop app) can choose, or the
|
|
86
|
+
* one of the last start, or a random one. It lets in connections and requests, and is published in a file
|
|
87
|
+
* only this user can read. It stays across restarts with the port (TaServeStateUtil), so that the web app
|
|
88
|
+
* installed from this address, which remembers both, signs in again by itself.
|
|
51
89
|
*/
|
|
52
90
|
let TaAccess = class TaAccess {
|
|
53
91
|
constructor() {
|
|
54
|
-
this.priority = ACCESS_MIDDLEWARE_PRIORITY;
|
|
55
|
-
this.token = process.env.TA_SERVE_TOKEN || (0, node_crypto_1.randomBytes)(32).toString('base64url');
|
|
92
|
+
this.priority = exports.ACCESS_MIDDLEWARE_PRIORITY;
|
|
93
|
+
this.token = process.env.TA_SERVE_TOKEN || serve_state_1.TaServeStateUtil.read().token || (0, node_crypto_1.randomBytes)(32).toString('base64url');
|
|
56
94
|
this.infoFile = (0, node_path_1.join)(ta_brand_1.TaBrand.agentDir(), ta_protocol_1.TA_SERVE_FILE);
|
|
57
95
|
}
|
|
58
96
|
allows(request) {
|
|
@@ -61,7 +99,17 @@ let TaAccess = class TaAccess {
|
|
|
61
99
|
}
|
|
62
100
|
/** Calls over a WebSocket were checked when it opened; this covers plain HTTP. */
|
|
63
101
|
async handle(ctx, next) {
|
|
64
|
-
|
|
102
|
+
const request = ctx.request;
|
|
103
|
+
if (node_1.RpcContext.connection()) {
|
|
104
|
+
await next();
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
if (this.allows(request) && TaAccessUtil.isHttpCall(request)) {
|
|
108
|
+
ctx.response.statusCode = 404;
|
|
109
|
+
ctx.response.end(`Call ta serve over its WebSocket, ${ta_protocol_1.TA_WEBSOCKET_PATH}.`);
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
if (this.allows(request) || (TaAccessUtil.isPublic(request) && this.acceptsHost(request))) {
|
|
65
113
|
await next();
|
|
66
114
|
return;
|
|
67
115
|
}
|
|
@@ -87,12 +135,21 @@ let TaAccess = class TaAccess {
|
|
|
87
135
|
publish(server) {
|
|
88
136
|
var _a;
|
|
89
137
|
const { port } = server.address();
|
|
90
|
-
const
|
|
138
|
+
const origin = `${(_a = this.host) !== null && _a !== void 0 ? _a : '127.0.0.1'}:${port}`;
|
|
139
|
+
const info = { url: `ws://${origin}${ta_protocol_1.TA_WEBSOCKET_PATH}`, token: this.token, pid: process.pid };
|
|
91
140
|
(0, node_fs_1.mkdirSync)((0, node_path_1.join)(this.infoFile, '..'), { recursive: true });
|
|
92
141
|
(0, node_fs_1.writeFileSync)(this.infoFile, JSON.stringify(info), { mode: 0o600 });
|
|
93
142
|
// The mode above only applies to a new file.
|
|
94
143
|
(0, node_fs_1.chmodSync)(this.infoFile, 0o600);
|
|
144
|
+
// A token that a parent process chose is its to keep.
|
|
145
|
+
const kept = serve_state_1.TaServeStateUtil.read().token;
|
|
146
|
+
serve_state_1.TaServeStateUtil.write({ port, token: process.env.TA_SERVE_TOKEN ? kept : this.token });
|
|
95
147
|
console.log(`ta serve: ${info.url} (token in ${this.infoFile})`);
|
|
148
|
+
if (process.env.TA_SERVE_OPEN_WEB) {
|
|
149
|
+
const url = TaAccessUtil.webUrl(`http://${origin}`, this.token);
|
|
150
|
+
console.log(`ta serve: web client at ${url}`);
|
|
151
|
+
TaAccessUtil.openBrowser(url);
|
|
152
|
+
}
|
|
96
153
|
}
|
|
97
154
|
};
|
|
98
155
|
exports.TaAccess = TaAccess;
|
|
@@ -105,6 +162,6 @@ __decorate([
|
|
|
105
162
|
__metadata("design:type", Object)
|
|
106
163
|
], TaAccess.prototype, "sessions", void 0);
|
|
107
164
|
exports.TaAccess = TaAccess = __decorate([
|
|
108
|
-
(0, core_1.Component)([node_1.RpcWebSocketGuard, node_2.Middleware, node_2.ServerAware, core_1.ApplicationLifecycle])
|
|
165
|
+
(0, core_1.Component)([exports.TA_ACCESS, node_1.RpcWebSocketGuard, node_2.Middleware, node_2.ServerAware, core_1.ApplicationLifecycle])
|
|
109
166
|
], TaAccess);
|
|
110
167
|
//# sourceMappingURL=ta-access.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-access.js","sourceRoot":"","sources":["../../src/node/ta-access.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA2D;AAC3D,qCAAsE;AAGtE,yCAAiC;AACjC,uCAAmG;AACnG,+CAAqE;AACrE,mEAA+D;AAC/D,qDAAyF;AACzF,+CAA6E;AAC7E,mDAAoD;AAEpD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpE,
|
|
1
|
+
{"version":3,"file":"ta-access.js","sourceRoot":"","sources":["../../src/node/ta-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,5 +21,13 @@ const request = (url, headers = {}) => ({ url, headers });
|
|
|
21
21
|
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isLoopbackHost('evil.example:3000')).toBe(false);
|
|
22
22
|
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isLoopbackHost(undefined)).toBe(false);
|
|
23
23
|
});
|
|
24
|
+
(0, bun_test_1.it)('tells calls over plain HTTP from the files and the pages', () => {
|
|
25
|
+
const call = (method, url) => ({ method, url, headers: {} });
|
|
26
|
+
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isHttpCall(call('POST', '/api/TaServer'))).toBe(true);
|
|
27
|
+
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isHttpCall(call('POST', '/api/TaWorkspaceServer?token=abc'))).toBe(true);
|
|
28
|
+
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isHttpCall(call('GET', '/api/files/x/a.png'))).toBe(false);
|
|
29
|
+
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isHttpCall(call('GET', '/api/ws'))).toBe(false);
|
|
30
|
+
(0, bun_test_1.expect)(ta_access_1.TaAccessUtil.isHttpCall(call('POST', '/index.html'))).toBe(false);
|
|
31
|
+
});
|
|
24
32
|
});
|
|
25
33
|
//# sourceMappingURL=ta-access.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-access.spec.js","sourceRoot":"","sources":["../../src/node/ta-access.spec.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAEhD,2CAA2C;AAE3C,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,OAAO,GAA2B,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAA+B,CAAC;AAExH,IAAA,mBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,IAAA,aAAE,EAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,IAAA,iBAAM,EAAC,wBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9F,IAAA,iBAAM,EAAC,wBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvE,IAAA,iBAAM,EAAC,wBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,iBAAM,EAAC,wBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,IAAA,iBAAM,EAAC,wBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,IAAA,iBAAM,EAAC,wBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,iCAAiC,EAAE,GAAG,EAAE;QACvC,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrE,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"ta-access.spec.js","sourceRoot":"","sources":["../../src/node/ta-access.spec.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAEhD,2CAA2C;AAE3C,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,OAAO,GAA2B,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAA+B,CAAC;AAExH,IAAA,mBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,IAAA,aAAE,EAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,IAAA,iBAAM,EAAC,wBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9F,IAAA,iBAAM,EAAC,wBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvE,IAAA,iBAAM,EAAC,wBAAY,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,iBAAM,EAAC,wBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,IAAA,iBAAM,EAAC,wBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,IAAA,iBAAM,EAAC,wBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,iCAAiC,EAAE,GAAG,EAAE;QACvC,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrE,IAAA,iBAAM,EAAC,wBAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,0DAA0D,EAAE,GAAG,EAAE;QAChE,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAA+B,CAAC;QAC3G,IAAA,iBAAM,EAAC,wBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,IAAA,iBAAM,EAAC,wBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7F,IAAA,iBAAM,EAAC,wBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAA,iBAAM,EAAC,wBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpE,IAAA,iBAAM,EAAC,wBAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/lib/node/ta-errors.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** The failures of {@link TaServer}
|
|
1
|
+
/** The failures of calls of the services of ta serve ({@link TaServer} and the others), which reach the client with their message and code. */
|
|
2
2
|
export declare namespace TaErrors {
|
|
3
3
|
function sessionNotFound(sessionId: string): Error;
|
|
4
4
|
function sessionLocked(sessionFile: string): Error;
|
|
@@ -6,6 +6,8 @@ export declare namespace TaErrors {
|
|
|
6
6
|
function messageConflict(clientMessageId: string): Error;
|
|
7
7
|
function modelNotFound(model: string): Error;
|
|
8
8
|
function invalidArgument(message: string, hint: string): Error;
|
|
9
|
+
/** Runs a call of a service of ta serve, so that what it throws reaches the client with its message (commandFailed). */
|
|
10
|
+
function guard<T>(command: () => T | Promise<T>): Promise<T>;
|
|
9
11
|
/** A command that pi refused or that failed. Other errors would lose their message on the way out. */
|
|
10
12
|
function commandFailed(cause: unknown): Error;
|
|
11
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-errors.d.ts","sourceRoot":"","sources":["../../src/node/ta-errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ta-errors.d.ts","sourceRoot":"","sources":["../../src/node/ta-errors.ts"],"names":[],"mappings":"AAWA,+IAA+I;AAC/I,yBAAiB,QAAQ,CAAC;IACtB,SAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAMxD;IAED,SAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAExD;IAED,SAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAElD;IAED,SAAgB,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,KAAK,CAM9D;IAED,SAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAMlD;IAED,SAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAEpE;IAED,wHAAwH;IACxH,SAAsB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAMxE;IAED,sGAAsG;IACtG,SAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAcnD;CACJ"}
|
package/lib/node/ta-errors.js
CHANGED
|
@@ -7,7 +7,9 @@ const TaError = core_1.ApplicationError.declare(ta_protocol_1.TA_RPC_ERROR_CODE,
|
|
|
7
7
|
message,
|
|
8
8
|
data: { code, hint },
|
|
9
9
|
}));
|
|
10
|
-
/**
|
|
10
|
+
/** What pi says when no provider is signed in for the model, or no model can be used. */
|
|
11
|
+
const NOT_SIGNED_IN = /^No (API key found for|model selected|models available)\b/;
|
|
12
|
+
/** The failures of calls of the services of ta serve ({@link TaServer} and the others), which reach the client with their message and code. */
|
|
11
13
|
var TaErrors;
|
|
12
14
|
(function (TaErrors) {
|
|
13
15
|
function sessionNotFound(sessionId) {
|
|
@@ -34,12 +36,26 @@ var TaErrors;
|
|
|
34
36
|
return TaError(ta_protocol_1.TaErrorCode.INVALID_ARGUMENT, message, hint);
|
|
35
37
|
}
|
|
36
38
|
TaErrors.invalidArgument = invalidArgument;
|
|
39
|
+
/** Runs a call of a service of ta serve, so that what it throws reaches the client with its message (commandFailed). */
|
|
40
|
+
async function guard(command) {
|
|
41
|
+
try {
|
|
42
|
+
return await command();
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
throw commandFailed(error);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
TaErrors.guard = guard;
|
|
37
49
|
/** A command that pi refused or that failed. Other errors would lose their message on the way out. */
|
|
38
50
|
function commandFailed(cause) {
|
|
39
51
|
if (core_1.ApplicationError.is(cause)) {
|
|
40
52
|
return cause;
|
|
41
53
|
}
|
|
42
54
|
const message = cause instanceof Error ? cause.message : String(cause);
|
|
55
|
+
if (NOT_SIGNED_IN.test(message)) {
|
|
56
|
+
// pi's own words go on about its /login and the paths of its documents, which a client does not have.
|
|
57
|
+
return TaError(ta_protocol_1.TaErrorCode.NOT_SIGNED_IN, message.split(/\n| Use \/login/)[0].trim(), 'Sign in to a provider of models (TaAuthServer.login), then send it again.');
|
|
58
|
+
}
|
|
43
59
|
return TaError(ta_protocol_1.TaErrorCode.COMMAND_FAILED, message, 'The message comes from the agent; fix what it says and send the command again.');
|
|
44
60
|
}
|
|
45
61
|
TaErrors.commandFailed = commandFailed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-errors.js","sourceRoot":"","sources":["../../src/node/ta-errors.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,qDAAuF;AAEvF,MAAM,OAAO,GAAG,uBAAgB,CAAC,OAAO,CAAsB,+BAAiB,EAAE,CAAC,IAAiB,EAAE,OAAe,EAAE,IAAY,EAAE,EAAE,CAAC,CAAC;IACpI,OAAO;IACP,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;CACvB,CAAC,CAAC,CAAC;AAEJ,
|
|
1
|
+
{"version":3,"file":"ta-errors.js","sourceRoot":"","sources":["../../src/node/ta-errors.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,qDAAuF;AAEvF,MAAM,OAAO,GAAG,uBAAgB,CAAC,OAAO,CAAsB,+BAAiB,EAAE,CAAC,IAAiB,EAAE,OAAe,EAAE,IAAY,EAAE,EAAE,CAAC,CAAC;IACpI,OAAO;IACP,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;CACvB,CAAC,CAAC,CAAC;AAEJ,yFAAyF;AACzF,MAAM,aAAa,GAAG,2DAA2D,CAAC;AAElF,+IAA+I;AAC/I,IAAiB,QAAQ,CA8DxB;AA9DD,WAAiB,QAAQ;IACrB,SAAgB,eAAe,CAAC,SAAiB;QAC7C,OAAO,OAAO,CACV,yBAAW,CAAC,iBAAiB,EAC7B,8BAA8B,SAAS,GAAG,EAC1C,kGAAkG,CACrG,CAAC;IACN,CAAC;IANe,SAAA,eAAe,kBAM9B,CAAA;IAED,SAAgB,aAAa,CAAC,WAAmB;QAC7C,OAAO,OAAO,CAAC,yBAAW,CAAC,cAAc,EAAE,eAAe,WAAW,qBAAqB,EAAE,iDAAiD,CAAC,CAAC;IACnJ,CAAC;IAFe,SAAA,aAAa,gBAE5B,CAAA;IAED,SAAgB,eAAe,CAAC,GAAW;QACvC,OAAO,OAAO,CAAC,yBAAW,CAAC,iBAAiB,EAAE,GAAG,GAAG,+CAA+C,EAAE,gDAAgD,CAAC,CAAC;IAC3J,CAAC;IAFe,SAAA,eAAe,kBAE9B,CAAA;IAED,SAAgB,eAAe,CAAC,eAAuB;QACnD,OAAO,OAAO,CACV,yBAAW,CAAC,gBAAgB,EAC5B,kBAAkB,eAAe,oCAAoC,EACrE,6CAA6C,CAChD,CAAC;IACN,CAAC;IANe,SAAA,eAAe,kBAM9B,CAAA;IAED,SAAgB,aAAa,CAAC,KAAa;QACvC,OAAO,OAAO,CACV,yBAAW,CAAC,eAAe,EAC3B,aAAa,KAAK,sCAAsC,EACxD,yEAAyE,CAC5E,CAAC;IACN,CAAC;IANe,SAAA,aAAa,gBAM5B,CAAA;IAED,SAAgB,eAAe,CAAC,OAAe,EAAE,IAAY;QACzD,OAAO,OAAO,CAAC,yBAAW,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC;IAFe,SAAA,eAAe,kBAE9B,CAAA;IAED,wHAAwH;IACjH,KAAK,UAAU,KAAK,CAAI,OAA6B;QACxD,IAAI,CAAC;YACD,OAAO,MAAM,OAAO,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IANqB,SAAA,KAAK,QAM1B,CAAA;IAED,sGAAsG;IACtG,SAAgB,aAAa,CAAC,KAAc;QACxC,IAAI,uBAAgB,CAAC,EAAE,CAAC,KAAe,CAAC,EAAE,CAAC;YACvC,OAAO,KAAc,CAAC;QAC1B,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,sGAAsG;YACtG,OAAO,OAAO,CACV,yBAAW,CAAC,aAAa,EACzB,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAC1C,2EAA2E,CAC9E,CAAC;QACN,CAAC;QACD,OAAO,OAAO,CAAC,yBAAW,CAAC,cAAc,EAAE,OAAO,EAAE,gFAAgF,CAAC,CAAC;IAC1I,CAAC;IAde,SAAA,aAAa,gBAc5B,CAAA;AACL,CAAC,EA9DgB,QAAQ,aAAR,QAAQ,GAAR,QAAQ,QA8DxB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ta-errors.spec.d.ts","sourceRoot":"","sources":["../../src/node/ta-errors.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const ta_protocol_1 = require("@celljs/ta-protocol");
|
|
5
|
+
const ta_errors_1 = require("./ta-errors");
|
|
6
|
+
const dataOf = (error) => error.data;
|
|
7
|
+
(0, bun_test_1.describe)('TaErrors', () => {
|
|
8
|
+
(0, bun_test_1.it)("names pi's failures for want of a sign-in, without its talk of /login and its paths", () => {
|
|
9
|
+
for (const text of [
|
|
10
|
+
'No API key found for anthropic.\n\nUse /login to log into a provider via OAuth or API key. See:\n /x/docs/providers.md',
|
|
11
|
+
'No model selected.\n\nUse /login…',
|
|
12
|
+
'No models available. Use /login…',
|
|
13
|
+
]) {
|
|
14
|
+
const error = ta_errors_1.TaErrors.commandFailed(new Error(text));
|
|
15
|
+
(0, bun_test_1.expect)(dataOf(error).code).toBe(ta_protocol_1.TaErrorCode.NOT_SIGNED_IN);
|
|
16
|
+
(0, bun_test_1.expect)(error.message).not.toContain('/login');
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
(0, bun_test_1.it)('passes on other failures of pi with their message', () => {
|
|
20
|
+
const error = ta_errors_1.TaErrors.commandFailed(new Error('Agent is already processing.'));
|
|
21
|
+
(0, bun_test_1.expect)(dataOf(error).code).toBe(ta_protocol_1.TaErrorCode.COMMAND_FAILED);
|
|
22
|
+
(0, bun_test_1.expect)(error.message).toBe('Agent is already processing.');
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
//# sourceMappingURL=ta-errors.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ta-errors.spec.js","sourceRoot":"","sources":["../../src/node/ta-errors.spec.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,qDAAkD;AAClD,2CAAuC;AAEvC,MAAM,MAAM,GAAG,CAAC,KAAY,EAAE,EAAE,CAAE,KAA6D,CAAC,IAAI,CAAC;AAErG,IAAA,mBAAQ,EAAC,UAAU,EAAE,GAAG,EAAE;IACtB,IAAA,aAAE,EAAC,qFAAqF,EAAE,GAAG,EAAE;QAC3F,KAAK,MAAM,IAAI,IAAI;YACf,yHAAyH;YACzH,mCAAmC;YACnC,kCAAkC;SACrC,EAAE,CAAC;YACA,MAAM,KAAK,GAAG,oBAAQ,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YACtD,IAAA,iBAAM,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,yBAAW,CAAC,aAAa,CAAC,CAAC;YAC3D,IAAA,iBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,MAAM,KAAK,GAAG,oBAAQ,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAChF,IAAA,iBAAM,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,yBAAW,CAAC,cAAc,CAAC,CAAC;QAC5D,IAAA,iBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,17 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ExecEnvironmentFactory } from '@celljs/ta-exec';
|
|
2
|
+
import { type RpcExtensionUIResponse, type TaAttachResult, type TaClientToolResult, type TaCommandResult, type TaForkFileResult, type TaNavigateResult, type TaOpenSessionOptions, type TaPromptInput, type TaPromptReceipt, TaServer, type TaServerInfo, type TaSessionInfo, type ThinkingLevel } from '@celljs/ta-protocol';
|
|
2
3
|
import { TaSessionRegistry } from './host-protocol';
|
|
3
4
|
import type { TaSession } from './ta-session';
|
|
4
|
-
|
|
5
|
+
import { TaWorkingDirectory } from './working-directory';
|
|
6
|
+
/**
|
|
7
|
+
* The sessions of ta serve. Each command of pi's RPC mode does here what it does in pi's `rpc-mode`, which
|
|
8
|
+
* pi exports only bound to stdio: when pi changes one, change it here too (the spec of TaServer in
|
|
9
|
+
* ta-protocol fails to compile when pi adds one).
|
|
10
|
+
*/
|
|
5
11
|
export declare class TaServerImpl implements TaServer {
|
|
6
12
|
protected readonly sessions: TaSessionRegistry;
|
|
13
|
+
protected readonly environments: ExecEnvironmentFactory;
|
|
14
|
+
protected readonly workingDirectory: TaWorkingDirectory;
|
|
15
|
+
getServerInfo(): Promise<TaServerInfo>;
|
|
16
|
+
setWorkingDirectory(cwd: string): Promise<TaServerInfo>;
|
|
7
17
|
openSession(options: TaOpenSessionOptions): Promise<TaSessionInfo>;
|
|
8
18
|
closeSession(sessionId: string): Promise<void>;
|
|
9
19
|
listSessions(): Promise<TaSessionInfo[]>;
|
|
10
20
|
attach(sessionId: string, afterSeq?: number): Promise<TaAttachResult>;
|
|
11
21
|
detach(sessionId: string): Promise<void>;
|
|
12
22
|
respondUi(sessionId: string, response: RpcExtensionUIResponse): Promise<boolean>;
|
|
13
|
-
|
|
14
|
-
respondClientTool(_sessionId: string, _result: TaClientToolResult): Promise<boolean>;
|
|
23
|
+
respondClientTool(sessionId: string, result: TaClientToolResult): Promise<boolean>;
|
|
15
24
|
prompt(sessionId: string, input: TaPromptInput): Promise<TaPromptReceipt>;
|
|
16
25
|
steer(sessionId: string, input: TaPromptInput): Promise<TaPromptReceipt>;
|
|
17
26
|
followUp(sessionId: string, input: TaPromptInput): Promise<TaPromptReceipt>;
|
|
@@ -36,15 +45,18 @@ export declare class TaServerImpl implements TaServer {
|
|
|
36
45
|
getSessionStats(sessionId: string): Promise<TaCommandResult<'get_session_stats'>>;
|
|
37
46
|
exportHtml(sessionId: string, outputPath?: string): Promise<TaCommandResult<'export_html'>>;
|
|
38
47
|
switchSession(sessionId: string, sessionPath: string): Promise<TaCommandResult<'switch_session'>>;
|
|
39
|
-
fork(sessionId: string, entryId: string): Promise<TaCommandResult<'fork'>>;
|
|
48
|
+
fork(sessionId: string, entryId: string, position?: 'before' | 'at'): Promise<TaCommandResult<'fork'>>;
|
|
49
|
+
forkToFile(sessionId: string, entryId: string, position?: 'before' | 'at'): Promise<TaForkFileResult>;
|
|
40
50
|
clone(sessionId: string): Promise<TaCommandResult<'clone'>>;
|
|
41
51
|
getForkMessages(sessionId: string): Promise<TaCommandResult<'get_fork_messages'>>;
|
|
42
52
|
getEntries(sessionId: string, since?: string): Promise<TaCommandResult<'get_entries'>>;
|
|
43
53
|
getTree(sessionId: string): Promise<TaCommandResult<'get_tree'>>;
|
|
54
|
+
navigateTree(sessionId: string, targetId: string): Promise<TaNavigateResult>;
|
|
44
55
|
getLastAssistantText(sessionId: string): Promise<TaCommandResult<'get_last_assistant_text'>>;
|
|
45
56
|
setSessionName(sessionId: string, name: string): Promise<void>;
|
|
46
57
|
getMessages(sessionId: string): Promise<TaCommandResult<'get_messages'>>;
|
|
47
58
|
getCommands(sessionId: string): Promise<TaCommandResult<'get_commands'>>;
|
|
59
|
+
reload(sessionId: string): Promise<void>;
|
|
48
60
|
protected on<T>(sessionId: string, command: (session: TaSession) => T | Promise<T>): Promise<T>;
|
|
49
61
|
protected guard<T>(command: () => Promise<T>): Promise<T>;
|
|
50
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-server-impl.d.ts","sourceRoot":"","sources":["../../src/node/ta-server-impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ta-server-impl.d.ts","sourceRoot":"","sources":["../../src/node/ta-server-impl.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EACH,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,QAAQ,EACR,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,aAAa,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;GAIG;AACH,qBACa,YAAa,YAAW,QAAQ;IAEzC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;IAElD,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,CAE3C;IAEK,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAS5D;IAEK,WAAW,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAEvE;IAED,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7C;IAEK,YAAY,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAE7C;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAEpE;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvC;IAED,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;IAED,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEjF;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAExE;IAED,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAEvE;IAED,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAE1E;IAED,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtC;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAErE;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAE7F;IAED,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAejE;IAED,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CASpG;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAErE;IAED,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAEtF;IAED,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;IAED,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAKtF;IAED,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC,CAEvG;IAED,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/E;IAED,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/E;IAED,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAE3F;IAED,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;IAED,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3C;IAED,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAcvG;IAED,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1C;IAED,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAEhF;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAE1F;IAED,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAEhG;IAED,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAKrG;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,QAAQ,GAAG,IAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmB9G;IAED,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAQ1D;IAED,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAEhF;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CASrF;IAED,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAE/D;IAED,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAE3E;IAED,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,yBAAyB,CAAC,CAAC,CAE3F;IAED,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO7D;IAED,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAEvE;IAED,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAYvE;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOvC;IAED,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAE9F;IAED,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAExD;CACJ"}
|