@namzu/cli 29.1.0 → 32.0.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/CHANGELOG.md +296 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +5 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/acp.d.ts +20 -2
- package/dist/commands/acp.d.ts.map +1 -1
- package/dist/commands/acp.js +42 -5
- package/dist/commands/acp.js.map +1 -1
- package/dist/commands/drain.d.ts.map +1 -1
- package/dist/commands/drain.js +2 -1
- package/dist/commands/drain.js.map +1 -1
- package/dist/commands/exec-json.d.ts.map +1 -1
- package/dist/commands/exec-json.js +24 -1
- package/dist/commands/exec-json.js.map +1 -1
- package/dist/commands/exec.d.ts.map +1 -1
- package/dist/commands/exec.js +5 -1
- package/dist/commands/exec.js.map +1 -1
- package/dist/commands/prior-messages.d.ts.map +1 -1
- package/dist/commands/prior-messages.js +42 -2
- package/dist/commands/prior-messages.js.map +1 -1
- package/dist/commands/schedule.d.ts.map +1 -1
- package/dist/commands/schedule.js +7 -5
- package/dist/commands/schedule.js.map +1 -1
- package/dist/config/composer-triggers.d.ts +41 -0
- package/dist/config/composer-triggers.d.ts.map +1 -0
- package/dist/config/composer-triggers.js +80 -0
- package/dist/config/composer-triggers.js.map +1 -0
- package/dist/config/load.d.ts.map +1 -1
- package/dist/config/load.js +58 -0
- package/dist/config/load.js.map +1 -1
- package/dist/config/schema.d.ts +34 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js.map +1 -1
- package/dist/context/doctrine.d.ts +3 -3
- package/dist/context/doctrine.d.ts.map +1 -1
- package/dist/context/doctrine.js +3 -3
- package/dist/context/doctrine.js.map +1 -1
- package/dist/context/environment.d.ts +26 -3
- package/dist/context/environment.d.ts.map +1 -1
- package/dist/context/environment.js +68 -9
- package/dist/context/environment.js.map +1 -1
- package/dist/context/runtime-message.d.ts.map +1 -1
- package/dist/context/runtime-message.js +4 -0
- package/dist/context/runtime-message.js.map +1 -1
- package/dist/integrations/mcp/servers.d.ts +72 -5
- package/dist/integrations/mcp/servers.d.ts.map +1 -1
- package/dist/integrations/mcp/servers.js +144 -23
- package/dist/integrations/mcp/servers.js.map +1 -1
- package/dist/integrations/notifications/desktop.d.ts +2 -0
- package/dist/integrations/notifications/desktop.d.ts.map +1 -1
- package/dist/integrations/notifications/desktop.js +6 -5
- package/dist/integrations/notifications/desktop.js.map +1 -1
- package/dist/integrations/plugins/runtime.d.ts +10 -2
- package/dist/integrations/plugins/runtime.d.ts.map +1 -1
- package/dist/integrations/plugins/runtime.js +16 -29
- package/dist/integrations/plugins/runtime.js.map +1 -1
- package/dist/integrations/providers/harness-credentials.d.ts +9 -4
- package/dist/integrations/providers/harness-credentials.d.ts.map +1 -1
- package/dist/integrations/providers/harness-credentials.js +16 -8
- package/dist/integrations/providers/harness-credentials.js.map +1 -1
- package/dist/integrations/resident/session-step.d.ts.map +1 -1
- package/dist/integrations/resident/session-step.js +2 -1
- package/dist/integrations/resident/session-step.js.map +1 -1
- package/dist/integrations/sessions/store.d.ts.map +1 -1
- package/dist/integrations/sessions/store.js +20 -2
- package/dist/integrations/sessions/store.js.map +1 -1
- package/dist/integrations/subagents/NamzuCliAgent.d.ts +8 -0
- package/dist/integrations/subagents/NamzuCliAgent.d.ts.map +1 -0
- package/dist/integrations/subagents/NamzuCliAgent.js +9 -0
- package/dist/integrations/subagents/NamzuCliAgent.js.map +1 -0
- package/dist/integrations/subagents/runtime.d.ts +5 -4
- package/dist/integrations/subagents/runtime.d.ts.map +1 -1
- package/dist/integrations/subagents/runtime.js +46 -11
- package/dist/integrations/subagents/runtime.js.map +1 -1
- package/dist/integrations/web/open-url.d.ts +24 -0
- package/dist/integrations/web/open-url.d.ts.map +1 -0
- package/dist/integrations/web/open-url.js +73 -0
- package/dist/integrations/web/open-url.js.map +1 -0
- package/dist/integrations/web/search.d.ts.map +1 -1
- package/dist/integrations/web/search.js +8 -6
- package/dist/integrations/web/search.js.map +1 -1
- package/dist/permissions/rules.d.ts +5 -1
- package/dist/permissions/rules.d.ts.map +1 -1
- package/dist/permissions/rules.js +85 -3
- package/dist/permissions/rules.js.map +1 -1
- package/dist/schedule/build.d.ts +26 -2
- package/dist/schedule/build.d.ts.map +1 -1
- package/dist/schedule/build.js +139 -20
- package/dist/schedule/build.js.map +1 -1
- package/dist/schedule/changes.d.ts +6 -0
- package/dist/schedule/changes.d.ts.map +1 -1
- package/dist/schedule/changes.js +23 -0
- package/dist/schedule/changes.js.map +1 -1
- package/dist/schedule/commands/add.d.ts +1 -1
- package/dist/schedule/commands/add.d.ts.map +1 -1
- package/dist/schedule/commands/add.js +188 -54
- package/dist/schedule/commands/add.js.map +1 -1
- package/dist/schedule/commands/lifecycle.d.ts.map +1 -1
- package/dist/schedule/commands/lifecycle.js +2 -1
- package/dist/schedule/commands/lifecycle.js.map +1 -1
- package/dist/schedule/commands/list.d.ts +2 -0
- package/dist/schedule/commands/list.d.ts.map +1 -1
- package/dist/schedule/commands/list.js +69 -20
- package/dist/schedule/commands/list.js.map +1 -1
- package/dist/schedule/daemon/daemon.d.ts +1 -1
- package/dist/schedule/daemon/daemon.d.ts.map +1 -1
- package/dist/schedule/daemon/daemon.js +22 -5
- package/dist/schedule/daemon/daemon.js.map +1 -1
- package/dist/schedule/daemon/notify.d.ts +29 -2
- package/dist/schedule/daemon/notify.d.ts.map +1 -1
- package/dist/schedule/daemon/notify.js +71 -2
- package/dist/schedule/daemon/notify.js.map +1 -1
- package/dist/schedule/env.d.ts +8 -4
- package/dist/schedule/env.d.ts.map +1 -1
- package/dist/schedule/env.js +13 -6
- package/dist/schedule/env.js.map +1 -1
- package/dist/schedule/fire/calls.d.ts +49 -0
- package/dist/schedule/fire/calls.d.ts.map +1 -0
- package/dist/schedule/fire/calls.js +114 -0
- package/dist/schedule/fire/calls.js.map +1 -0
- package/dist/schedule/fire/fire.d.ts +1 -1
- package/dist/schedule/fire/fire.d.ts.map +1 -1
- package/dist/schedule/fire/fire.js +209 -15
- package/dist/schedule/fire/fire.js.map +1 -1
- package/dist/schedule/fire/result.d.ts +1 -1
- package/dist/schedule/fire/result.d.ts.map +1 -1
- package/dist/schedule/fire/result.js +2 -1
- package/dist/schedule/fire/result.js.map +1 -1
- package/dist/schedule/fire/run-script.d.ts +46 -0
- package/dist/schedule/fire/run-script.d.ts.map +1 -0
- package/dist/schedule/fire/run-script.js +81 -0
- package/dist/schedule/fire/run-script.js.map +1 -0
- package/dist/schedule/fire/unattended-note.d.ts +8 -0
- package/dist/schedule/fire/unattended-note.d.ts.map +1 -1
- package/dist/schedule/fire/unattended-note.js +5 -0
- package/dist/schedule/fire/unattended-note.js.map +1 -1
- package/dist/schedule/fire/wake-gate.d.ts +39 -0
- package/dist/schedule/fire/wake-gate.d.ts.map +1 -0
- package/dist/schedule/fire/wake-gate.js +90 -0
- package/dist/schedule/fire/wake-gate.js.map +1 -0
- package/dist/schedule/floor.d.ts +28 -8
- package/dist/schedule/floor.d.ts.map +1 -1
- package/dist/schedule/floor.js +624 -114
- package/dist/schedule/floor.js.map +1 -1
- package/dist/schedule/policy.d.ts +40 -0
- package/dist/schedule/policy.d.ts.map +1 -1
- package/dist/schedule/policy.js +36 -0
- package/dist/schedule/policy.js.map +1 -1
- package/dist/schedule/script-check.d.ts +53 -0
- package/dist/schedule/script-check.d.ts.map +1 -0
- package/dist/schedule/script-check.js +145 -0
- package/dist/schedule/script-check.js.map +1 -0
- package/dist/schedule/script-shell.d.ts +3 -0
- package/dist/schedule/script-shell.d.ts.map +1 -0
- package/dist/schedule/script-shell.js +5 -0
- package/dist/schedule/script-shell.js.map +1 -0
- package/dist/schedule/service/index.d.ts +1 -1
- package/dist/schedule/service/index.d.ts.map +1 -1
- package/dist/schedule/service/index.js +20 -11
- package/dist/schedule/service/index.js.map +1 -1
- package/dist/schedule/service/manifest.js +1 -1
- package/dist/schedule/service/manifest.js.map +1 -1
- package/dist/schedule/service/windows-task.d.ts +7 -0
- package/dist/schedule/service/windows-task.d.ts.map +1 -1
- package/dist/schedule/service/windows-task.js +65 -0
- package/dist/schedule/service/windows-task.js.map +1 -1
- package/dist/schedule/service/wsl.d.ts +13 -1
- package/dist/schedule/service/wsl.d.ts.map +1 -1
- package/dist/schedule/service/wsl.js +16 -6
- package/dist/schedule/service/wsl.js.map +1 -1
- package/dist/schedule/store/atomic.d.ts +5 -2
- package/dist/schedule/store/atomic.d.ts.map +1 -1
- package/dist/schedule/store/atomic.js +7 -4
- package/dist/schedule/store/atomic.js.map +1 -1
- package/dist/schedule/store/claims.js +1 -1
- package/dist/schedule/store/claims.js.map +1 -1
- package/dist/schedule/store/history.d.ts +1 -1
- package/dist/schedule/store/history.d.ts.map +1 -1
- package/dist/schedule/store/history.js +4 -1
- package/dist/schedule/store/history.js.map +1 -1
- package/dist/schedule/store/jobs.d.ts +19 -3
- package/dist/schedule/store/jobs.d.ts.map +1 -1
- package/dist/schedule/store/jobs.js +83 -16
- package/dist/schedule/store/jobs.js.map +1 -1
- package/dist/schedule/store/state.js +1 -1
- package/dist/schedule/store/state.js.map +1 -1
- package/dist/schedule/types.d.ts +98 -6
- package/dist/schedule/types.d.ts.map +1 -1
- package/dist/schedule/types.js +25 -1
- package/dist/schedule/types.js.map +1 -1
- package/dist/schedule/visible-source.d.ts +18 -0
- package/dist/schedule/visible-source.d.ts.map +1 -0
- package/dist/schedule/visible-source.js +59 -0
- package/dist/schedule/visible-source.js.map +1 -0
- package/dist/skills/directory.d.ts +38 -0
- package/dist/skills/directory.d.ts.map +1 -0
- package/dist/skills/directory.js +51 -0
- package/dist/skills/directory.js.map +1 -0
- package/dist/test-support/toolset.d.ts +23 -0
- package/dist/test-support/toolset.d.ts.map +1 -0
- package/dist/test-support/toolset.js +27 -0
- package/dist/test-support/toolset.js.map +1 -0
- package/dist/tui/App.d.ts.map +1 -1
- package/dist/tui/App.js +343 -64
- package/dist/tui/App.js.map +1 -1
- package/dist/tui/ChoicePicker.d.ts +2 -0
- package/dist/tui/ChoicePicker.d.ts.map +1 -1
- package/dist/tui/ChoicePicker.js +10 -2
- package/dist/tui/ChoicePicker.js.map +1 -1
- package/dist/tui/Composer.d.ts +62 -3
- package/dist/tui/Composer.d.ts.map +1 -1
- package/dist/tui/Composer.js +162 -25
- package/dist/tui/Composer.js.map +1 -1
- package/dist/tui/ComposerFrame.d.ts +1 -1
- package/dist/tui/ComposerFrame.js +3 -3
- package/dist/tui/ComposerFrame.js.map +1 -1
- package/dist/tui/EffortSlider.d.ts +8 -9
- package/dist/tui/EffortSlider.d.ts.map +1 -1
- package/dist/tui/EffortSlider.js +15 -12
- package/dist/tui/EffortSlider.js.map +1 -1
- package/dist/tui/PermissionOverlay.d.ts +13 -1
- package/dist/tui/PermissionOverlay.d.ts.map +1 -1
- package/dist/tui/PermissionOverlay.js +26 -4
- package/dist/tui/PermissionOverlay.js.map +1 -1
- package/dist/tui/StatusBar.d.ts +12 -12
- package/dist/tui/StatusBar.d.ts.map +1 -1
- package/dist/tui/StatusBar.js +15 -15
- package/dist/tui/StatusBar.js.map +1 -1
- package/dist/tui/agent.d.ts +73 -12
- package/dist/tui/agent.d.ts.map +1 -1
- package/dist/tui/agent.js +430 -180
- package/dist/tui/agent.js.map +1 -1
- package/dist/tui/hypermode.d.ts +37 -0
- package/dist/tui/hypermode.d.ts.map +1 -0
- package/dist/tui/hypermode.js +58 -0
- package/dist/tui/hypermode.js.map +1 -0
- package/dist/tui/open-browser.d.ts +29 -1
- package/dist/tui/open-browser.d.ts.map +1 -1
- package/dist/tui/open-browser.js +83 -11
- package/dist/tui/open-browser.js.map +1 -1
- package/dist/tui/permission-review.d.ts +11 -2
- package/dist/tui/permission-review.d.ts.map +1 -1
- package/dist/tui/permission-review.js +176 -19
- package/dist/tui/permission-review.js.map +1 -1
- package/dist/tui/schedule/host-commands.d.ts.map +1 -1
- package/dist/tui/schedule/host-commands.js +95 -33
- package/dist/tui/schedule/host-commands.js.map +1 -1
- package/dist/tui/schedule/integration.d.ts +6 -2
- package/dist/tui/schedule/integration.d.ts.map +1 -1
- package/dist/tui/schedule/integration.js +3 -1
- package/dist/tui/schedule/integration.js.map +1 -1
- package/dist/tui/schedule/resume.d.ts.map +1 -1
- package/dist/tui/schedule/resume.js +10 -1
- package/dist/tui/schedule/resume.js.map +1 -1
- package/dist/tui/schedule/tool-host.d.ts +18 -1
- package/dist/tui/schedule/tool-host.d.ts.map +1 -1
- package/dist/tui/schedule/tool-host.js +384 -84
- package/dist/tui/schedule/tool-host.js.map +1 -1
- package/dist/tui/slashCommands.d.ts +23 -5
- package/dist/tui/slashCommands.d.ts.map +1 -1
- package/dist/tui/slashCommands.js +80 -31
- package/dist/tui/slashCommands.js.map +1 -1
- package/dist/tui/theme.d.ts +10 -4
- package/dist/tui/theme.d.ts.map +1 -1
- package/dist/tui/theme.js +4 -3
- package/dist/tui/theme.js.map +1 -1
- package/dist/tui/triggers/analyze.d.ts +57 -0
- package/dist/tui/triggers/analyze.d.ts.map +1 -0
- package/dist/tui/triggers/analyze.js +221 -0
- package/dist/tui/triggers/analyze.js.map +1 -0
- package/dist/tui/triggers/context-text.d.ts +21 -0
- package/dist/tui/triggers/context-text.d.ts.map +1 -0
- package/dist/tui/triggers/context-text.js +44 -0
- package/dist/tui/triggers/context-text.js.map +1 -0
- package/dist/tui/triggers/copy.d.ts +38 -0
- package/dist/tui/triggers/copy.d.ts.map +1 -0
- package/dist/tui/triggers/copy.js +163 -0
- package/dist/tui/triggers/copy.js.map +1 -0
- package/dist/tui/triggers/detect.d.ts +83 -0
- package/dist/tui/triggers/detect.d.ts.map +1 -0
- package/dist/tui/triggers/detect.js +295 -0
- package/dist/tui/triggers/detect.js.map +1 -0
- package/dist/tui/triggers/fold.d.ts +34 -0
- package/dist/tui/triggers/fold.d.ts.map +1 -0
- package/dist/tui/triggers/fold.js +44 -0
- package/dist/tui/triggers/fold.js.map +1 -0
- package/dist/tui/triggers/pattern.d.ts +66 -0
- package/dist/tui/triggers/pattern.d.ts.map +1 -0
- package/dist/tui/triggers/pattern.js +243 -0
- package/dist/tui/triggers/pattern.js.map +1 -0
- package/dist/tui/triggers/provenance.d.ts +58 -0
- package/dist/tui/triggers/provenance.d.ts.map +1 -0
- package/dist/tui/triggers/provenance.js +98 -0
- package/dist/tui/triggers/provenance.js.map +1 -0
- package/dist/tui/triggers/registry.d.ts +113 -0
- package/dist/tui/triggers/registry.d.ts.map +1 -0
- package/dist/tui/triggers/registry.js +164 -0
- package/dist/tui/triggers/registry.js.map +1 -0
- package/dist/tui/triggers/setting.d.ts +18 -0
- package/dist/tui/triggers/setting.d.ts.map +1 -0
- package/dist/tui/triggers/setting.js +61 -0
- package/dist/tui/triggers/setting.js.map +1 -0
- package/dist/tui/triggers/verbs.d.ts +29 -0
- package/dist/tui/triggers/verbs.d.ts.map +1 -0
- package/dist/tui/triggers/verbs.js +140 -0
- package/dist/tui/triggers/verbs.js.map +1 -0
- package/dist/tui/types.d.ts +3 -1
- package/dist/tui/types.d.ts.map +1 -1
- package/package.json +12 -12
- package/skills/README.md +5 -0
- package/skills/schedule-task/SKILL.md +123 -5
|
@@ -14,7 +14,7 @@ export interface ServiceContext {
|
|
|
14
14
|
readonly run: CommandRunner;
|
|
15
15
|
readonly env: NodeJS.ProcessEnv;
|
|
16
16
|
readonly version: string;
|
|
17
|
-
/** Windows tools under WSL; default the
|
|
17
|
+
/** Windows tools under WSL; default those under the drive mount root `/etc/wsl.conf` sets. */
|
|
18
18
|
readonly tools?: WindowsTools;
|
|
19
19
|
}
|
|
20
20
|
export interface InstallRequest {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schedule/service/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,eAAe,EAIpB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EACN,KAAK,cAAc,EAOnB,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schedule/service/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,EAEN,KAAK,eAAe,EACpB,KAAK,eAAe,EAIpB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EACN,KAAK,cAAc,EAOnB,MAAM,cAAc,CAAA;AASrB,OAAO,EACN,KAAK,YAAY,EAQjB,MAAM,UAAU,CAAA;AAEjB,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAA;IAC7B,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAA;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,8FAA8F;IAC9F,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAA;CAC7B;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAA;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CACzB;AAYD,qBAAa,cAAe,SAAQ,KAAK;IACxC,SAAkB,IAAI,oBAAmB;CACzC;AAkBD,wBAAsB,cAAc,CACnC,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA0L7E;AA6CD,oFAAoF;AACpF,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,cAAc,GACjB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,eAAe,CAAA;CAAE,CAAC,CAe7D;AAED,uCAAuC;AACvC,wBAAsB,YAAY,CACjC,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CA0BjB;AAED,wBAAsB,YAAY,CACjC,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC,CA8BnB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAChC,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC,CA2BnB"}
|
|
@@ -10,8 +10,17 @@ import { isAbsolute, join } from 'node:path';
|
|
|
10
10
|
import { installLaunchd, launchdLabel, launchdPlistPath, uninstallLaunchd } from './launchd.js';
|
|
11
11
|
import { readManifest, removeManifest, writeManifest, } from './manifest.js';
|
|
12
12
|
import { installSystemd, startSystemd, stopSystemd, systemdState, systemdUnitPath, uninstallSystemd, } from './systemd.js';
|
|
13
|
-
import { parseTaskQuery, removeEmptyTaskFolderArguments, taskPath, taskXml, taskXmlBytes, } from './windows-task.js';
|
|
13
|
+
import { describeTaskResult, parseTaskQuery, removeEmptyTaskFolderArguments, taskPath, taskXml, taskXmlBytes, } from './windows-task.js';
|
|
14
14
|
import { isEphemeralBin, probeInterop, toWindowsPath, windowsTools, windowsUser, wslTaskDefinition, wslTaskName, } from './wsl.js';
|
|
15
|
+
/**
|
|
16
|
+
* Where a Windows program a WSL-installed task needs is started: `C:` under
|
|
17
|
+
* this machine's drive mount root. Nothing for a supervisor that is not WSL's.
|
|
18
|
+
*/
|
|
19
|
+
function windowsCwd(ctx, manifest) {
|
|
20
|
+
return manifest.platform === 'wsl-windows-task'
|
|
21
|
+
? { cwd: (ctx.tools ?? windowsTools()).drive }
|
|
22
|
+
: {};
|
|
23
|
+
}
|
|
15
24
|
export class ServiceRefusal extends Error {
|
|
16
25
|
name = 'ServiceRefusal';
|
|
17
26
|
}
|
|
@@ -154,11 +163,11 @@ export async function installService(ctx, request) {
|
|
|
154
163
|
const name = wslTaskName(request.name, distro);
|
|
155
164
|
const path = taskPath(name);
|
|
156
165
|
// The XML goes where Windows can read it without a UNC path.
|
|
157
|
-
const localAppData = (await run(tools.cmd, ['/d', '/c', 'echo', '%LOCALAPPDATA%'], { cwd:
|
|
166
|
+
const localAppData = (await run(tools.cmd, ['/d', '/c', 'echo', '%LOCALAPPDATA%'], { cwd: tools.drive })).stdout.trim();
|
|
158
167
|
if (!/^[A-Za-z]:\\/.test(localAppData))
|
|
159
168
|
throw new ServiceRefusal('could not resolve %LOCALAPPDATA% through interop');
|
|
160
169
|
const linuxDir = (await run('wslpath', ['-u', `${localAppData}\\namzu`])).stdout.trim();
|
|
161
|
-
if (!linuxDir.startsWith(
|
|
170
|
+
if (!linuxDir.startsWith(tools.mountRoot))
|
|
162
171
|
throw new ServiceRefusal(`could not map ${localAppData} into WSL`);
|
|
163
172
|
mkdirSync(linuxDir, { recursive: true });
|
|
164
173
|
const linuxFile = join(linuxDir, `${name}.xml`);
|
|
@@ -166,11 +175,11 @@ export async function installService(ctx, request) {
|
|
|
166
175
|
const problems = [];
|
|
167
176
|
try {
|
|
168
177
|
const windowsFile = await toWindowsPath(run, linuxFile);
|
|
169
|
-
const created = await run(tools.schtasks, ['/Create', '/TN', path, '/XML', windowsFile, '/F'], { cwd:
|
|
178
|
+
const created = await run(tools.schtasks, ['/Create', '/TN', path, '/XML', windowsFile, '/F'], { cwd: tools.drive });
|
|
170
179
|
if (created.code !== 0)
|
|
171
180
|
problems.push(`schtasks.exe /Create: ${created.stderr.trim() || created.stdout.trim()}`);
|
|
172
181
|
else {
|
|
173
|
-
const started = await run(tools.schtasks, ['/Run', '/TN', path], { cwd:
|
|
182
|
+
const started = await run(tools.schtasks, ['/Run', '/TN', path], { cwd: tools.drive });
|
|
174
183
|
if (started.code !== 0)
|
|
175
184
|
problems.push(`schtasks.exe /Run: ${started.stderr.trim() || started.stdout.trim()}`);
|
|
176
185
|
}
|
|
@@ -217,7 +226,7 @@ async function removeArtifact(ctx, manifest, artifact) {
|
|
|
217
226
|
});
|
|
218
227
|
case 'windows-task': {
|
|
219
228
|
const schtasks = manifest.windows?.schtasks ?? 'schtasks.exe';
|
|
220
|
-
const cwd = manifest
|
|
229
|
+
const cwd = windowsCwd(ctx, manifest);
|
|
221
230
|
await ctx.run(schtasks, ['/End', '/TN', artifact.taskPath], cwd);
|
|
222
231
|
await ctx.run(schtasks, ['/Delete', '/TN', artifact.taskPath, '/F'], cwd);
|
|
223
232
|
const queried = await ctx.run(schtasks, ['/Query', '/TN', artifact.taskPath], cwd);
|
|
@@ -226,7 +235,7 @@ async function removeArtifact(ctx, manifest, artifact) {
|
|
|
226
235
|
// The `\namzu` folder `/Create` made, once nothing else is in it.
|
|
227
236
|
const powershell = manifest.windows?.powershell ??
|
|
228
237
|
(manifest.platform === 'wsl-windows-task'
|
|
229
|
-
? windowsTools().powershell
|
|
238
|
+
? (ctx.tools ?? windowsTools()).powershell
|
|
230
239
|
: `${ctx.env.SystemRoot ?? 'C:\\Windows'}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`);
|
|
231
240
|
const folder = await ctx.run(powershell, removeEmptyTaskFolderArguments(), cwd);
|
|
232
241
|
return folder.code === 0
|
|
@@ -271,12 +280,12 @@ export async function serviceState(ctx, manifest) {
|
|
|
271
280
|
case 'windows-task':
|
|
272
281
|
case 'wsl-windows-task': {
|
|
273
282
|
const schtasks = manifest.windows?.schtasks ?? 'schtasks.exe';
|
|
274
|
-
const cwd = manifest
|
|
283
|
+
const cwd = windowsCwd(ctx, manifest);
|
|
275
284
|
const queried = await ctx.run(schtasks, ['/Query', '/TN', manifest.windows?.taskPath ?? '', '/FO', 'LIST', '/V'], cwd);
|
|
276
285
|
if (queried.code !== 0)
|
|
277
286
|
return 'Task Scheduler: task not found';
|
|
278
287
|
const fields = parseTaskQuery(queried.stdout);
|
|
279
|
-
return `Task Scheduler: ${fields.status ?? 'unknown'}${fields.state ? `, ${fields.state.toLowerCase()}` : ''}${fields.lastResult ? `, last result ${fields.lastResult}` : ''}`;
|
|
288
|
+
return `Task Scheduler: ${fields.status ?? 'unknown'}${fields.state ? `, ${fields.state.toLowerCase()}` : ''}${fields.lastResult ? `, last result: ${describeTaskResult(fields.lastResult)}` : ''}`;
|
|
280
289
|
}
|
|
281
290
|
}
|
|
282
291
|
}
|
|
@@ -304,7 +313,7 @@ export async function startService(ctx, manifest) {
|
|
|
304
313
|
case 'windows-task':
|
|
305
314
|
case 'wsl-windows-task': {
|
|
306
315
|
const schtasks = manifest.windows?.schtasks ?? 'schtasks.exe';
|
|
307
|
-
const cwd = manifest
|
|
316
|
+
const cwd = windowsCwd(ctx, manifest);
|
|
308
317
|
const task = manifest.windows?.taskPath ?? '';
|
|
309
318
|
const enabled = await ctx.run(schtasks, ['/Change', '/TN', task, '/ENABLE'], cwd);
|
|
310
319
|
if (enabled.code !== 0)
|
|
@@ -339,7 +348,7 @@ export async function stopService(ctx, manifest) {
|
|
|
339
348
|
case 'windows-task':
|
|
340
349
|
case 'wsl-windows-task': {
|
|
341
350
|
const schtasks = manifest.windows?.schtasks ?? 'schtasks.exe';
|
|
342
|
-
const cwd = manifest
|
|
351
|
+
const cwd = windowsCwd(ctx, manifest);
|
|
343
352
|
const task = manifest.windows?.taskPath ?? '';
|
|
344
353
|
const disabled = await ctx.run(schtasks, ['/Change', '/TN', task, '/DISABLE'], cwd);
|
|
345
354
|
await ctx.run(schtasks, ['/End', '/TN', task], cwd);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schedule/service/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schedule/service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { rmSync } from 'node:fs';
|
|
6
6
|
import { readVersioned, writeJsonAtomic } from '../store/atomic.js';
|
|
7
7
|
export function readManifest(paths) {
|
|
8
|
-
return readVersioned(paths.service, 'schedule-service');
|
|
8
|
+
return readVersioned(paths.service, 'schedule-service', 1);
|
|
9
9
|
}
|
|
10
10
|
export function writeManifest(paths, manifest) {
|
|
11
11
|
writeJsonAtomic(paths.service, manifest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/schedule/service/manifest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AA+BnE,MAAM,UAAU,YAAY,CAAC,KAAoB;IAChD,OAAO,aAAa,CAAkB,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/schedule/service/manifest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AA+BnE,MAAM,UAAU,YAAY,CAAC,KAAoB;IAChD,OAAO,aAAa,CAAkB,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAA;AAC5E,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAoB,EAAE,QAAyB;IAC5E,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAoB;IAClD,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AACvC,CAAC"}
|
|
@@ -42,6 +42,13 @@ export declare function taskPath(name: string): string;
|
|
|
42
42
|
export declare const REMOVE_EMPTY_TASK_FOLDER_SCRIPT: string;
|
|
43
43
|
/** `powershell.exe` arguments that run {@link REMOVE_EMPTY_TASK_FOLDER_SCRIPT}. */
|
|
44
44
|
export declare function removeEmptyTaskFolderArguments(): string[];
|
|
45
|
+
/**
|
|
46
|
+
* A task's last result in words, the number kept in parentheses as
|
|
47
|
+
* `schtasks` printed it (and in hexadecimal when that is how Windows
|
|
48
|
+
* documents it): `running (267009, 0x41301)`. An unknown result is the
|
|
49
|
+
* number alone.
|
|
50
|
+
*/
|
|
51
|
+
export declare function describeTaskResult(raw: string): string;
|
|
45
52
|
/** `schtasks /Query … /FO LIST /V` → the fields a status line needs. */
|
|
46
53
|
export declare function parseTaskQuery(output: string): {
|
|
47
54
|
status?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windows-task.d.ts","sourceRoot":"","sources":["../../../src/schedule/service/windows-task.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;
|
|
1
|
+
{"version":3,"file":"windows-task.d.ts","sourceRoot":"","sources":["../../../src/schedule/service/windows-task.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAKH,MAAM,WAAW,cAAc;IAC9B,wCAAwC;IACxC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,mCAAmC;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IAChC,oDAAoD;IACpD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAC/B;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CA0DpD;AAED,8DAA8D;AAC9D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,kDAAkD;AAClD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,QAQhC,CAAA;AAEZ,mFAAmF;AACnF,wBAAgB,8BAA8B,IAAI,MAAM,EAAE,CASzD;AA0CD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAgBtD;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB,CAgBA"}
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
* `schtasks /XML` reads UTF-16; the file is written UTF-16LE with a BOM to
|
|
17
17
|
* match its declaration.
|
|
18
18
|
*/
|
|
19
|
+
import { EXIT_STOP_REQUESTED } from '../daemon/exit.js';
|
|
19
20
|
import { windowsArgument, xmlText } from './quote.js';
|
|
20
21
|
export function taskXml(task) {
|
|
21
22
|
const start = task.startBoundary ?? '2026-01-01T00:00:00';
|
|
@@ -112,6 +113,70 @@ export function removeEmptyTaskFolderArguments() {
|
|
|
112
113
|
Buffer.from(REMOVE_EMPTY_TASK_FOLDER_SCRIPT, 'utf16le').toString('base64'),
|
|
113
114
|
];
|
|
114
115
|
}
|
|
116
|
+
/**
|
|
117
|
+
* Task Scheduler's own results, and the Windows errors a task of ours can
|
|
118
|
+
* end with, by their unsigned 32-bit value. `schtasks /Query /V` prints
|
|
119
|
+
* them as signed decimals (`267009`, `-2147020576`), which say nothing.
|
|
120
|
+
*/
|
|
121
|
+
const TASK_RESULTS = new Map([
|
|
122
|
+
[0x0, 'succeeded'],
|
|
123
|
+
[0x41300, 'ready to run'],
|
|
124
|
+
[0x41301, 'running'],
|
|
125
|
+
[0x41302, 'disabled'],
|
|
126
|
+
[0x41303, 'not run yet'],
|
|
127
|
+
[0x41304, 'no more runs scheduled'],
|
|
128
|
+
[0x41306, 'ended by a person or a stop'],
|
|
129
|
+
[0x41307, 'no trigger is enabled'],
|
|
130
|
+
[0x8004131f, 'an instance was already running, so a new one was not started'],
|
|
131
|
+
// IgnoreNew answers the five-minute re-check this way while the
|
|
132
|
+
// scheduler runs: the expected result, not a failure.
|
|
133
|
+
[
|
|
134
|
+
0x800710e0,
|
|
135
|
+
'an instance was already running, so a new one was not started; expected, since the task checks every five minutes',
|
|
136
|
+
],
|
|
137
|
+
[0x80041326, 'the task is disabled'],
|
|
138
|
+
[0x80070002, 'the program was not found'],
|
|
139
|
+
[0x80070005, 'access was denied'],
|
|
140
|
+
[0x8007010b, 'the start folder is not valid'],
|
|
141
|
+
[0x800704dd, 'the user was not logged on'],
|
|
142
|
+
[0xc000013a, 'ended when its console closed'],
|
|
143
|
+
[0x40010004, 'ended by a sign-out or shutdown'],
|
|
144
|
+
]);
|
|
145
|
+
/**
|
|
146
|
+
* The daemon's own exit codes, which Task Scheduler reports as the last
|
|
147
|
+
* result once `wsl.exe` (or `node`) exits.
|
|
148
|
+
*/
|
|
149
|
+
const DAEMON_EXITS = new Map([
|
|
150
|
+
[1, 'the program exited with an error; see namzu schedule logs'],
|
|
151
|
+
[75, 'the scheduler exited: another one owns this NAMZU_HOME'],
|
|
152
|
+
[EXIT_STOP_REQUESTED, 'the scheduler exited: namzu schedule stop asked it to'],
|
|
153
|
+
]);
|
|
154
|
+
/**
|
|
155
|
+
* A task's last result in words, the number kept in parentheses as
|
|
156
|
+
* `schtasks` printed it (and in hexadecimal when that is how Windows
|
|
157
|
+
* documents it): `running (267009, 0x41301)`. An unknown result is the
|
|
158
|
+
* number alone.
|
|
159
|
+
*/
|
|
160
|
+
export function describeTaskResult(raw) {
|
|
161
|
+
const text = raw.trim();
|
|
162
|
+
let value;
|
|
163
|
+
if (/^0x[0-9a-f]{1,8}$/i.test(text))
|
|
164
|
+
value = Number.parseInt(text.slice(2), 16);
|
|
165
|
+
else if (/^-?\d{1,10}$/.test(text))
|
|
166
|
+
value = Number(text);
|
|
167
|
+
else
|
|
168
|
+
return text;
|
|
169
|
+
const code = value >>> 0;
|
|
170
|
+
const hex = `0x${code.toString(16).toUpperCase()}`;
|
|
171
|
+
// A small exit code reads as itself; anything else in hexadecimal too.
|
|
172
|
+
const number = code < 256 || /^0x/i.test(text) ? text : `${text}, ${hex}`;
|
|
173
|
+
const words = TASK_RESULTS.get(code) ??
|
|
174
|
+
DAEMON_EXITS.get(code) ??
|
|
175
|
+
(code < 256 ? 'the program exited' : undefined);
|
|
176
|
+
if (words !== undefined)
|
|
177
|
+
return `${words} (${number})`;
|
|
178
|
+
return number === text ? text : `${text} (${hex})`;
|
|
179
|
+
}
|
|
115
180
|
/** `schtasks /Query … /FO LIST /V` → the fields a status line needs. */
|
|
116
181
|
export function parseTaskQuery(output) {
|
|
117
182
|
const field = (label) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windows-task.js","sourceRoot":"","sources":["../../../src/schedule/service/windows-task.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"windows-task.js","sourceRoot":"","sources":["../../../src/schedule/service/windows-task.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,13 @@
|
|
|
16
16
|
import type { CommandRunner } from './runner.js';
|
|
17
17
|
import { type TaskDefinition, taskPath } from './windows-task.js';
|
|
18
18
|
export interface WindowsTools {
|
|
19
|
+
/** Where WSL mounts the Windows drives, with a trailing slash (`/mnt/`). */
|
|
20
|
+
readonly mountRoot: string;
|
|
21
|
+
/**
|
|
22
|
+
* `C:` as WSL mounts it (`/mnt/c`): the directory a Windows program is
|
|
23
|
+
* started in, since one started in a Linux directory warns about UNC paths.
|
|
24
|
+
*/
|
|
25
|
+
readonly drive: string;
|
|
19
26
|
readonly systemRoot: string;
|
|
20
27
|
readonly cmd: string;
|
|
21
28
|
readonly schtasks: string;
|
|
@@ -24,7 +31,12 @@ export interface WindowsTools {
|
|
|
24
31
|
readonly conhost: string;
|
|
25
32
|
readonly wsl: string;
|
|
26
33
|
}
|
|
27
|
-
|
|
34
|
+
/** `System32` under the default mount root. */
|
|
35
|
+
export declare const DEFAULT_SYSTEM32: string;
|
|
36
|
+
/**
|
|
37
|
+
* The Windows programs, under `system32` — by default under the drive mount
|
|
38
|
+
* root `/etc/wsl.conf` sets (`[automount] root`, `/mnt/` unless moved).
|
|
39
|
+
*/
|
|
28
40
|
export declare function windowsTools(system32?: string): WindowsTools;
|
|
29
41
|
/** Interop answers: a Windows program starts and exits 0. */
|
|
30
42
|
export declare function probeInterop(run: CommandRunner, tools: WindowsTools, env?: NodeJS.ProcessEnv): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsl.d.ts","sourceRoot":"","sources":["../../../src/schedule/service/wsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"wsl.d.ts","sourceRoot":"","sources":["../../../src/schedule/service/wsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,KAAK,cAAc,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjE,MAAM,WAAW,YAAY;IAC5B,4EAA4E;IAC5E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CACpB;AAED,+CAA+C;AAC/C,eAAO,MAAM,gBAAgB,QAAgB,CAAA;AAE7C;;;GAGG;AACH,wBAAgB,YAAY,CAAC,QAAQ,SAAkC,GAAG,YAAY,CAcrF;AAED,6DAA6D;AAC7D,wBAAsB,YAAY,CACjC,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,YAAY,EACnB,GAAG,GAAE,MAAM,CAAC,UAAwB,GAClC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBvD;AAED,+DAA+D;AAC/D,wBAAsB,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAS1F;AAED,6DAA6D;AAC7D,wBAAsB,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIrF;AAED,qEAAqE;AACrE,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC5B,GAAG,cAAc,CAiCjB;AAED,OAAO,EAAE,QAAQ,EAAE,CAAA"}
|
|
@@ -14,12 +14,22 @@
|
|
|
14
14
|
* npx cache (it disappears).
|
|
15
15
|
*/
|
|
16
16
|
import { existsSync } from 'node:fs';
|
|
17
|
+
import { readWslMountRoot, wslSystem32 } from '../../context/environment.js';
|
|
17
18
|
import { checkWslPath } from './quote.js';
|
|
18
19
|
import { taskPath } from './windows-task.js';
|
|
19
|
-
|
|
20
|
-
export
|
|
20
|
+
/** `System32` under the default mount root. */
|
|
21
|
+
export const DEFAULT_SYSTEM32 = wslSystem32();
|
|
22
|
+
/**
|
|
23
|
+
* The Windows programs, under `system32` — by default under the drive mount
|
|
24
|
+
* root `/etc/wsl.conf` sets (`[automount] root`, `/mnt/` unless moved).
|
|
25
|
+
*/
|
|
26
|
+
export function windowsTools(system32 = wslSystem32(readWslMountRoot())) {
|
|
27
|
+
const systemRoot = system32.replace(/\/System32$/i, '');
|
|
28
|
+
const drive = systemRoot.replace(/\/Windows$/i, '');
|
|
21
29
|
return {
|
|
22
|
-
|
|
30
|
+
mountRoot: drive.replace(/[^/]+$/, ''),
|
|
31
|
+
drive,
|
|
32
|
+
systemRoot,
|
|
23
33
|
cmd: `${system32}/cmd.exe`,
|
|
24
34
|
schtasks: `${system32}/schtasks.exe`,
|
|
25
35
|
powershell: `${system32}/WindowsPowerShell/v1.0/powershell.exe`,
|
|
@@ -31,14 +41,14 @@ export function windowsTools(system32 = DEFAULT_SYSTEM32) {
|
|
|
31
41
|
/** Interop answers: a Windows program starts and exits 0. */
|
|
32
42
|
export async function probeInterop(run, tools, env = process.env) {
|
|
33
43
|
if (!existsSync(tools.cmd))
|
|
34
|
-
return { ok: false, reason: `${tools.cmd} was not found (is C: mounted at
|
|
44
|
+
return { ok: false, reason: `${tools.cmd} was not found (is C: mounted at ${tools.drive}?)` };
|
|
35
45
|
if (!env.WSL_INTEROP && !existsSync('/proc/sys/fs/binfmt_misc/WSLInterop')) {
|
|
36
46
|
return {
|
|
37
47
|
ok: false,
|
|
38
48
|
reason: 'WSL interop is disabled ([interop] enabled=false in /etc/wsl.conf)',
|
|
39
49
|
};
|
|
40
50
|
}
|
|
41
|
-
const result = await run(tools.cmd, ['/d', '/c', 'ver'], { timeoutMs: 20_000, cwd:
|
|
51
|
+
const result = await run(tools.cmd, ['/d', '/c', 'ver'], { timeoutMs: 20_000, cwd: tools.drive });
|
|
42
52
|
return result.code === 0
|
|
43
53
|
? { ok: true }
|
|
44
54
|
: {
|
|
@@ -48,7 +58,7 @@ export async function probeInterop(run, tools, env = process.env) {
|
|
|
48
58
|
}
|
|
49
59
|
/** `DOMAIN\user` of the Windows account, from `whoami.exe`. */
|
|
50
60
|
export async function windowsUser(run, tools) {
|
|
51
|
-
const result = await run(tools.whoami, [], { timeoutMs: 20_000, cwd:
|
|
61
|
+
const result = await run(tools.whoami, [], { timeoutMs: 20_000, cwd: tools.drive });
|
|
52
62
|
const user = result.stdout.trim();
|
|
53
63
|
if (result.code !== 0 || !/^[^\\\s]+\\[^\\\s]+$/.test(user)) {
|
|
54
64
|
throw new Error(`could not read the Windows user from whoami.exe (${result.stderr.trim() || user || `exit ${result.code}`})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsl.js","sourceRoot":"","sources":["../../../src/schedule/service/wsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,EAAuB,QAAQ,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"wsl.js","sourceRoot":"","sources":["../../../src/schedule/service/wsl.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,10 +34,13 @@ export declare function writeJsonAtomic(path: string, value: unknown): void;
|
|
|
34
34
|
export declare function publishExclusive(path: string, value: unknown): boolean;
|
|
35
35
|
/**
|
|
36
36
|
* Read a scheduler file of `kind`, or `undefined` when there is none.
|
|
37
|
-
* Refuses a newer
|
|
37
|
+
* Refuses a version newer than `maxVersion` or another kind, naming the
|
|
38
|
+
* file. `maxVersion` is this reader's own ceiling for this record kind, not
|
|
39
|
+
* a single global number: a job reader's ceiling moves independently of a
|
|
40
|
+
* claim reader's.
|
|
38
41
|
*/
|
|
39
42
|
export declare function readVersioned<T extends {
|
|
40
43
|
readonly v: number;
|
|
41
44
|
readonly kind: string;
|
|
42
|
-
}>(path: string, kind: T['kind']): T | undefined;
|
|
45
|
+
}>(path: string, kind: T['kind'], maxVersion: number): T | undefined;
|
|
43
46
|
//# sourceMappingURL=atomic.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomic.d.ts","sourceRoot":"","sources":["../../../src/schedule/store/atomic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAgBH,eAAO,MAAM,iBAAiB,MAAQ,CAAA;AACtC,eAAO,MAAM,gBAAgB,MAAQ,CAAA;AAErC,kEAAkE;AAClE,qBAAa,mBAAoB,SAAQ,KAAK;IAG5C,QAAQ,CAAC,IAAI,EAAE,MAAM;IAFtB,SAAkB,IAAI,yBAAwB;gBAEpC,IAAI,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM;CAIhB;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE5C;AAgCD,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAalE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAgBtE;AAED
|
|
1
|
+
{"version":3,"file":"atomic.d.ts","sourceRoot":"","sources":["../../../src/schedule/store/atomic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAgBH,eAAO,MAAM,iBAAiB,MAAQ,CAAA;AACtC,eAAO,MAAM,gBAAgB,MAAQ,CAAA;AAErC,kEAAkE;AAClE,qBAAa,mBAAoB,SAAQ,KAAK;IAG5C,QAAQ,CAAC,IAAI,EAAE,MAAM;IAFtB,SAAkB,IAAI,yBAAwB;gBAEpC,IAAI,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM;CAIhB;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE5C;AAgCD,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAalE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAgBtE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACpF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EACf,UAAU,EAAE,MAAM,GAChB,CAAC,GAAG,SAAS,CAyBf"}
|
|
@@ -104,9 +104,12 @@ export function publishExclusive(path, value) {
|
|
|
104
104
|
}
|
|
105
105
|
/**
|
|
106
106
|
* Read a scheduler file of `kind`, or `undefined` when there is none.
|
|
107
|
-
* Refuses a newer
|
|
107
|
+
* Refuses a version newer than `maxVersion` or another kind, naming the
|
|
108
|
+
* file. `maxVersion` is this reader's own ceiling for this record kind, not
|
|
109
|
+
* a single global number: a job reader's ceiling moves independently of a
|
|
110
|
+
* claim reader's.
|
|
108
111
|
*/
|
|
109
|
-
export function readVersioned(path, kind) {
|
|
112
|
+
export function readVersioned(path, kind, maxVersion) {
|
|
110
113
|
let text;
|
|
111
114
|
try {
|
|
112
115
|
text = readFileSync(path, 'utf8');
|
|
@@ -127,8 +130,8 @@ export function readVersioned(path, kind) {
|
|
|
127
130
|
if (typeof record !== 'object' || record === null || record.kind !== kind) {
|
|
128
131
|
throw new ScheduleFormatError(path, `is not a ${kind} file`);
|
|
129
132
|
}
|
|
130
|
-
if (typeof record.v !== 'number' || record.v >
|
|
131
|
-
throw new ScheduleFormatError(path, `was written by a newer namzu (format ${String(record.v)}); this one reads format
|
|
133
|
+
if (typeof record.v !== 'number' || record.v > maxVersion) {
|
|
134
|
+
throw new ScheduleFormatError(path, `was written by a newer namzu (format ${String(record.v)}); this one reads up to format ${maxVersion} and will not change it`);
|
|
132
135
|
}
|
|
133
136
|
return parsed;
|
|
134
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../../src/schedule/store/atomic.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../../src/schedule/store/atomic.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export function claimOccurrence(paths, claim) {
|
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
export function readClaim(paths, jobId, key) {
|
|
25
|
-
return readVersioned(paths.claim(jobId, key), 'schedule-claim');
|
|
25
|
+
return readVersioned(paths.claim(jobId, key), 'schedule-claim', 1);
|
|
26
26
|
}
|
|
27
27
|
export function isClaimed(paths, jobId, key) {
|
|
28
28
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claims.js","sourceRoot":"","sources":["../../../src/schedule/store/claims.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAY7D,yFAAyF;AACzF,MAAM,UAAU,eAAe,CAC9B,KAAoB,EACpB,KAAwC;IAExC,IAAI,CAAC,qCAAqC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CACd,sEAAsE,KAAK,CAAC,GAAG,EAAE,CACjF,CAAA;IACF,CAAC;IACD,OAAO,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;QAC5D,CAAC,EAAE,CAAC;QACJ,IAAI,EAAE,gBAAgB;QACtB,GAAG,KAAK;KACR,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CACxB,KAAoB,EACpB,KAAa,EACb,GAAW;IAEX,OAAO,aAAa,CAAgB,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"claims.js","sourceRoot":"","sources":["../../../src/schedule/store/claims.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAY7D,yFAAyF;AACzF,MAAM,UAAU,eAAe,CAC9B,KAAoB,EACpB,KAAwC;IAExC,IAAI,CAAC,qCAAqC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CACd,sEAAsE,KAAK,CAAC,GAAG,EAAE,CACjF,CAAA;IACF,CAAC;IACD,OAAO,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;QAC5D,CAAC,EAAE,CAAC;QACJ,IAAI,EAAE,gBAAgB;QACtB,GAAG,KAAK;KACR,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CACxB,KAAoB,EACpB,KAAa,EACb,GAAW;IAEX,OAAO,aAAa,CAAgB,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAA;AAClF,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAoB,EAAE,KAAa,EAAE,GAAW;IACzE,IAAI,CAAC;QACJ,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;QACjC,OAAO,IAAI,CAAA;IACZ,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAA;IACb,CAAC;AACF,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,WAAW,CAC1B,KAAoB,EACpB,KAAa,EACb,QAAgB,EAChB,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,IAAI,KAAe,CAAA;IACnB,IAAI,CAAC;QACJ,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,CAAC,CAAA;IACT,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,CAAC,KAAK;YAAE,SAAQ;QACpB,IAAI,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YAC1D,OAAO,EAAE,CAAA;QACV,CAAC;IACF,CAAC;IACD,OAAO,OAAO,CAAA;AACf,CAAC"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* compaction.
|
|
8
8
|
*/
|
|
9
9
|
import type { SchedulePaths } from '../paths.js';
|
|
10
|
-
import type
|
|
10
|
+
import { type ScheduleHistoryRecord } from '../types.js';
|
|
11
11
|
export declare function appendHistory(paths: SchedulePaths, jobId: string, record: ScheduleHistoryRecord): void;
|
|
12
12
|
/** Every readable record, oldest first. A torn or foreign line is skipped. */
|
|
13
13
|
export declare function readHistory(paths: SchedulePaths, jobId: string): ScheduleHistoryRecord[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../src/schedule/store/history.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../src/schedule/store/history.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAGN,KAAK,qBAAqB,EAC1B,MAAM,aAAa,CAAA;AA2BpB,wBAAgB,aAAa,CAC5B,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,qBAAqB,GAC3B,IAAI,CASN;AAED,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,qBAAqB,EAAE,CAqBxF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,SAAS,qBAAqB,EAAE,GAAG,qBAAqB,EAAE,CAe9F;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,MAAM,CAoB5F"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { closeSync, openSync, readFileSync, renameSync, statSync, writeSync } from 'node:fs';
|
|
10
10
|
import { dirname } from 'node:path';
|
|
11
|
+
import { SCHEDULE_FORMAT_VERSION, SCHEDULE_FORMAT_VERSION_LEGACY, } from '../types.js';
|
|
11
12
|
import { PRIVATE_FILE_MODE, ensureDir } from './atomic.js';
|
|
12
13
|
const MAX_LINE = 4_000;
|
|
13
14
|
const KEEP_RECORDS = 500;
|
|
@@ -58,7 +59,9 @@ export function readHistory(paths, jobId) {
|
|
|
58
59
|
continue;
|
|
59
60
|
try {
|
|
60
61
|
const record = JSON.parse(line);
|
|
61
|
-
if (record &&
|
|
62
|
+
if (record &&
|
|
63
|
+
(record.v === SCHEDULE_FORMAT_VERSION_LEGACY || record.v === SCHEDULE_FORMAT_VERSION) &&
|
|
64
|
+
typeof record.kind === 'string')
|
|
62
65
|
out.push(record);
|
|
63
66
|
}
|
|
64
67
|
catch { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../src/schedule/store/history.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../src/schedule/store/history.ts"],"names":[],"mappings":"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"}
|