waterplane 0.1.25 → 0.1.26
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 +29 -0
- package/SECURITY.md +24 -4
- package/node_modules/@waterplane/shared/dist/agentseries/compare.d.ts +8 -0
- package/node_modules/@waterplane/shared/dist/agentseries/compare.js +103 -0
- package/node_modules/@waterplane/shared/dist/agentseries/compare.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/agentseries/markers.d.ts +17 -0
- package/node_modules/@waterplane/shared/dist/agentseries/markers.js +125 -0
- package/node_modules/@waterplane/shared/dist/agentseries/markers.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/agentseries/series.d.ts +16 -0
- package/node_modules/@waterplane/shared/dist/agentseries/series.js +93 -0
- package/node_modules/@waterplane/shared/dist/agentseries/series.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/agentseries/stats.d.ts +8 -0
- package/node_modules/@waterplane/shared/dist/agentseries/stats.js +33 -0
- package/node_modules/@waterplane/shared/dist/agentseries/stats.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/agentseries/types.d.ts +103 -0
- package/node_modules/@waterplane/shared/dist/agentseries/types.js +11 -0
- package/node_modules/@waterplane/shared/dist/agentseries/types.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/agentseries.d.ts +10 -0
- package/node_modules/@waterplane/shared/dist/agentseries.js +11 -0
- package/node_modules/@waterplane/shared/dist/agentseries.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/calday.d.ts +5 -0
- package/node_modules/@waterplane/shared/dist/calday.js +10 -0
- package/node_modules/@waterplane/shared/dist/calday.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/clihealth/healthfixture.d.ts +13 -1
- package/node_modules/@waterplane/shared/dist/clihealth/healthfixture.js +22 -4
- package/node_modules/@waterplane/shared/dist/clihealth/healthfixture.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/clihealth.d.ts +1 -1
- package/node_modules/@waterplane/shared/dist/clihealth.js +1 -1
- package/node_modules/@waterplane/shared/dist/clihealth.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/dictate.d.ts +6 -0
- package/node_modules/@waterplane/shared/dist/dictate.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/dictatemodels.d.ts +23 -0
- package/node_modules/@waterplane/shared/dist/dictatemodels.js +31 -0
- package/node_modules/@waterplane/shared/dist/dictatemodels.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/healthspend.d.ts +23 -0
- package/node_modules/@waterplane/shared/dist/healthspend.js +31 -0
- package/node_modules/@waterplane/shared/dist/healthspend.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/index.d.ts +7 -0
- package/node_modules/@waterplane/shared/dist/index.js +7 -0
- package/node_modules/@waterplane/shared/dist/index.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/installrow.js +10 -0
- package/node_modules/@waterplane/shared/dist/installrow.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/itempaths.d.ts +23 -0
- package/node_modules/@waterplane/shared/dist/itempaths.js +38 -0
- package/node_modules/@waterplane/shared/dist/itempaths.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/pluginlaunch.d.ts +3 -2
- package/node_modules/@waterplane/shared/dist/pluginlaunch.js +1 -1
- package/node_modules/@waterplane/shared/dist/pluginlaunch.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/pricelist.d.ts +57 -0
- package/node_modules/@waterplane/shared/dist/pricelist.js +128 -0
- package/node_modules/@waterplane/shared/dist/pricelist.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/pricing.d.ts +86 -9
- package/node_modules/@waterplane/shared/dist/pricing.js +140 -20
- package/node_modules/@waterplane/shared/dist/pricing.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/queue/queuelanestate.d.ts +14 -0
- package/node_modules/@waterplane/shared/dist/queue/queuelanestate.js +25 -0
- package/node_modules/@waterplane/shared/dist/queue/queuelanestate.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/queue/queueplan.d.ts +4 -0
- package/node_modules/@waterplane/shared/dist/queue/queueplan.js +21 -0
- package/node_modules/@waterplane/shared/dist/queue/queueplan.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/queue/queuewords.js +2 -1
- package/node_modules/@waterplane/shared/dist/queue/queuewords.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/queue.d.ts +2 -0
- package/node_modules/@waterplane/shared/dist/queue.js +1 -0
- package/node_modules/@waterplane/shared/dist/queue.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/skillstate.d.ts +51 -0
- package/node_modules/@waterplane/shared/dist/skillstate.js +176 -0
- package/node_modules/@waterplane/shared/dist/skillstate.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/skillwords.d.ts +10 -0
- package/node_modules/@waterplane/shared/dist/skillwords.js +18 -0
- package/node_modules/@waterplane/shared/dist/skillwords.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/wire/agentreadings.d.ts +147 -3
- package/node_modules/@waterplane/shared/dist/wire/agentreadings.js +29 -0
- package/node_modules/@waterplane/shared/dist/wire/agentreadings.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/wire/backend.d.ts +2 -0
- package/node_modules/@waterplane/shared/dist/wire/costwindow.d.ts +4 -0
- package/node_modules/@waterplane/shared/dist/wire/dictatesetup.d.ts +42 -0
- package/node_modules/@waterplane/shared/dist/wire/dictatesetup.js +9 -0
- package/node_modules/@waterplane/shared/dist/wire/dictatesetup.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/wire/messages/hostcore.d.ts +22 -1
- package/node_modules/@waterplane/shared/dist/wire/skills.d.ts +142 -0
- package/node_modules/@waterplane/shared/dist/wire/skills.js +6 -0
- package/node_modules/@waterplane/shared/dist/wire/skills.js.map +1 -0
- package/node_modules/@waterplane/shared/dist/wire/sysstat.d.ts +17 -0
- package/node_modules/@waterplane/shared/dist/wire/telemetry.d.ts +4 -0
- package/npm-shrinkwrap.json +2 -2
- package/package.json +1 -1
- package/packages/extensions/diskspace/waterplane-plugin.json +16 -0
- package/packages/extensions/links/waterplane-plugin.json +18 -0
- package/packages/host/dist/agentclass.d.ts +42 -31
- package/packages/host/dist/agentclass.js +155 -5
- package/packages/host/dist/agentclass.js.map +1 -1
- package/packages/host/dist/agentmarkers.d.ts +49 -0
- package/packages/host/dist/agentmarkers.js +255 -0
- package/packages/host/dist/agentmarkers.js.map +1 -0
- package/packages/host/dist/agentreadings.d.ts +30 -2
- package/packages/host/dist/agentreadings.js +89 -7
- package/packages/host/dist/agentreadings.js.map +1 -1
- package/packages/host/dist/agentscan.d.ts +1 -1
- package/packages/host/dist/agentscan.js +107 -9
- package/packages/host/dist/agentscan.js.map +1 -1
- package/packages/host/dist/archive.js +9 -3
- package/packages/host/dist/archive.js.map +1 -1
- package/packages/host/dist/artifacts.js +4 -7
- package/packages/host/dist/artifacts.js.map +1 -1
- package/packages/host/dist/askrules.js +12 -4
- package/packages/host/dist/askrules.js.map +1 -1
- package/packages/host/dist/auth.d.ts +1 -0
- package/packages/host/dist/auth.js +5 -3
- package/packages/host/dist/auth.js.map +1 -1
- package/packages/host/dist/autopull.js +4 -8
- package/packages/host/dist/autopull.js.map +1 -1
- package/packages/host/dist/backends/claude.js +1 -0
- package/packages/host/dist/backends/claude.js.map +1 -1
- package/packages/host/dist/backends/derive.js +3 -1
- package/packages/host/dist/backends/derive.js.map +1 -1
- package/packages/host/dist/binguard.js +19 -2
- package/packages/host/dist/binguard.js.map +1 -1
- package/packages/host/dist/capture.js +7 -10
- package/packages/host/dist/capture.js.map +1 -1
- package/packages/host/dist/clifixtures.d.ts +24 -4
- package/packages/host/dist/clifixtures.js +50 -10
- package/packages/host/dist/clifixtures.js.map +1 -1
- package/packages/host/dist/clihealth.d.ts +8 -2
- package/packages/host/dist/clihealth.js +11 -3
- package/packages/host/dist/clihealth.js.map +1 -1
- package/packages/host/dist/costwindow.js +4 -2
- package/packages/host/dist/costwindow.js.map +1 -1
- package/packages/host/dist/ctxlog/ctxagents.d.ts +2 -0
- package/packages/host/dist/ctxlog/ctxagents.js +5 -5
- package/packages/host/dist/ctxlog/ctxagents.js.map +1 -1
- package/packages/host/dist/ctxlog/ctxcursor.d.ts +2 -0
- package/packages/host/dist/ctxlog/ctxcursor.js +2 -2
- package/packages/host/dist/ctxlog/ctxcursor.js.map +1 -1
- package/packages/host/dist/ctxlog/ctxupdate.js +11 -6
- package/packages/host/dist/ctxlog/ctxupdate.js.map +1 -1
- package/packages/host/dist/deliver/deliverknobs.d.ts +0 -2
- package/packages/host/dist/deliver/deliverknobs.js +0 -2
- package/packages/host/dist/deliver/deliverknobs.js.map +1 -1
- package/packages/host/dist/deliver/deliverproof.d.ts +3 -2
- package/packages/host/dist/deliver/deliverproof.js +9 -8
- package/packages/host/dist/deliver/deliverproof.js.map +1 -1
- package/packages/host/dist/deliver/deliverreturn.d.ts +3 -2
- package/packages/host/dist/deliver/deliverreturn.js +13 -12
- package/packages/host/dist/deliver/deliverreturn.js.map +1 -1
- package/packages/host/dist/deliver/deliverrun.js +20 -18
- package/packages/host/dist/deliver/deliverrun.js.map +1 -1
- package/packages/host/dist/deliver/deliverscreen.d.ts +2 -1
- package/packages/host/dist/deliver/deliverscreen.js +9 -8
- package/packages/host/dist/deliver/deliverscreen.js.map +1 -1
- package/packages/host/dist/deliver/delivertypes.d.ts +4 -0
- package/packages/host/dist/deliver.js +2 -1
- package/packages/host/dist/deliver.js.map +1 -1
- package/packages/host/dist/dictate.d.ts +11 -0
- package/packages/host/dist/dictate.js +20 -10
- package/packages/host/dist/dictate.js.map +1 -1
- package/packages/host/dist/dictatesetup.d.ts +54 -0
- package/packages/host/dist/dictatesetup.js +261 -0
- package/packages/host/dist/dictatesetup.js.map +1 -0
- package/packages/host/dist/doctor.js +1 -1
- package/packages/host/dist/doctor.js.map +1 -1
- package/packages/host/dist/exposurepush.js +2 -2
- package/packages/host/dist/exposurepush.js.map +1 -1
- package/packages/host/dist/extensions/diskspace/host/candidates.d.mts +180 -0
- package/packages/host/dist/extensions/diskspace/host/candidates.mjs +716 -0
- package/packages/host/dist/extensions/diskspace/host/candidates.mjs.map +1 -0
- package/packages/host/dist/extensions/diskspace/host/engine.d.mts +21 -0
- package/packages/host/dist/extensions/diskspace/host/engine.mjs +498 -0
- package/packages/host/dist/extensions/diskspace/host/engine.mjs.map +1 -0
- package/packages/host/dist/extensions/diskspace/host/index.d.mts +25 -0
- package/packages/host/dist/extensions/diskspace/host/index.mjs +135 -0
- package/packages/host/dist/extensions/diskspace/host/index.mjs.map +1 -0
- package/packages/host/dist/extensions/diskspace/host/large.d.mts +11 -0
- package/packages/host/dist/extensions/diskspace/host/large.mjs +56 -0
- package/packages/host/dist/extensions/diskspace/host/large.mjs.map +1 -0
- package/packages/host/dist/extensions/diskspace/host/run.d.mts +94 -0
- package/packages/host/dist/extensions/diskspace/host/run.mjs +200 -0
- package/packages/host/dist/extensions/diskspace/host/run.mjs.map +1 -0
- package/packages/host/dist/extensions/diskspace/shared/wire.d.mts +197 -0
- package/packages/host/dist/extensions/diskspace/shared/wire.mjs +23 -0
- package/packages/host/dist/extensions/diskspace/shared/wire.mjs.map +1 -0
- package/packages/host/dist/extensions/links/host/engine.d.mts +39 -0
- package/packages/host/dist/extensions/links/host/engine.mjs +285 -0
- package/packages/host/dist/extensions/links/host/engine.mjs.map +1 -0
- package/packages/host/dist/extensions/links/host/index.d.mts +10 -0
- package/packages/host/dist/extensions/links/host/index.mjs +72 -0
- package/packages/host/dist/extensions/links/host/index.mjs.map +1 -0
- package/packages/host/dist/extensions/links/host/parse.d.mts +61 -0
- package/packages/host/dist/extensions/links/host/parse.mjs +225 -0
- package/packages/host/dist/extensions/links/host/parse.mjs.map +1 -0
- package/packages/host/dist/extensions/links/host/run.d.mts +15 -0
- package/packages/host/dist/extensions/links/host/run.mjs +32 -0
- package/packages/host/dist/extensions/links/host/run.mjs.map +1 -0
- package/packages/host/dist/extensions/links/host/store.d.mts +11 -0
- package/packages/host/dist/extensions/links/host/store.mjs +76 -0
- package/packages/host/dist/extensions/links/host/store.mjs.map +1 -0
- package/packages/host/dist/extensions/links/shared/wire.d.mts +141 -0
- package/packages/host/dist/extensions/links/shared/wire.mjs +20 -0
- package/packages/host/dist/extensions/links/shared/wire.mjs.map +1 -0
- package/packages/host/dist/git.d.ts +5 -3
- package/packages/host/dist/git.js +16 -28
- package/packages/host/dist/git.js.map +1 -1
- package/packages/host/dist/halt.js +16 -3
- package/packages/host/dist/halt.js.map +1 -1
- package/packages/host/dist/jsonstore.d.ts +16 -4
- package/packages/host/dist/jsonstore.js +32 -8
- package/packages/host/dist/jsonstore.js.map +1 -1
- package/packages/host/dist/landedbase.d.ts +41 -0
- package/packages/host/dist/landedbase.js +59 -0
- package/packages/host/dist/landedbase.js.map +1 -0
- package/packages/host/dist/lantls.js +2 -2
- package/packages/host/dist/lantls.js.map +1 -1
- package/packages/host/dist/limitretry.js +2 -3
- package/packages/host/dist/limitretry.js.map +1 -1
- package/packages/host/dist/localledger.js +9 -12
- package/packages/host/dist/localledger.js.map +1 -1
- package/packages/host/dist/main.js +2 -0
- package/packages/host/dist/main.js.map +1 -1
- package/packages/host/dist/opendeliveries.d.ts +4 -0
- package/packages/host/dist/opendeliveries.js +27 -1
- package/packages/host/dist/opendeliveries.js.map +1 -1
- package/packages/host/dist/plugins/setupcontrib.js +3 -2
- package/packages/host/dist/plugins/setupcontrib.js.map +1 -1
- package/packages/host/dist/pricefetch.d.ts +80 -0
- package/packages/host/dist/pricefetch.js +289 -0
- package/packages/host/dist/pricefetch.js.map +1 -0
- package/packages/host/dist/pricegap.d.ts +11 -0
- package/packages/host/dist/pricegap.js +30 -0
- package/packages/host/dist/pricegap.js.map +1 -0
- package/packages/host/dist/repohealthscopes.js +16 -24
- package/packages/host/dist/repohealthscopes.js.map +1 -1
- package/packages/host/dist/repos.d.ts +4 -0
- package/packages/host/dist/repos.js +1 -1
- package/packages/host/dist/repos.js.map +1 -1
- package/packages/host/dist/routes/apiagentpoints.d.ts +5 -0
- package/packages/host/dist/routes/apiagentpoints.js +48 -0
- package/packages/host/dist/routes/apiagentpoints.js.map +1 -0
- package/packages/host/dist/routes/apidictate.d.ts +2 -0
- package/packages/host/dist/routes/apidictate.js +27 -0
- package/packages/host/dist/routes/apidictate.js.map +1 -0
- package/packages/host/dist/routes/apihost.js +3 -2
- package/packages/host/dist/routes/apihost.js.map +1 -1
- package/packages/host/dist/routes/apirepofiles.js +3 -1
- package/packages/host/dist/routes/apirepofiles.js.map +1 -1
- package/packages/host/dist/routes/apirepowork.js +3 -2
- package/packages/host/dist/routes/apirepowork.js.map +1 -1
- package/packages/host/dist/routes/apiroutes.js +4 -1
- package/packages/host/dist/routes/apiroutes.js.map +1 -1
- package/packages/host/dist/routes/apiskills.d.ts +3 -0
- package/packages/host/dist/routes/apiskills.js +81 -0
- package/packages/host/dist/routes/apiskills.js.map +1 -0
- package/packages/host/dist/routes/apistats.js +2 -2
- package/packages/host/dist/routes/apistats.js.map +1 -1
- package/packages/host/dist/server/billingwire.js +5 -0
- package/packages/host/dist/server/billingwire.js.map +1 -1
- package/packages/host/dist/server/deliveries.d.ts +4 -1
- package/packages/host/dist/server/deliveries.js +38 -6
- package/packages/host/dist/server/deliveries.js.map +1 -1
- package/packages/host/dist/server/intentDeps.js +7 -6
- package/packages/host/dist/server/intentDeps.js.map +1 -1
- package/packages/host/dist/server/wsops.js +2 -1
- package/packages/host/dist/server/wsops.js.map +1 -1
- package/packages/host/dist/sessions/core.d.ts +1 -0
- package/packages/host/dist/sessions/ctxseries.js +7 -5
- package/packages/host/dist/sessions/ctxseries.js.map +1 -1
- package/packages/host/dist/sessions/drive.d.ts +6 -1
- package/packages/host/dist/sessions/drive.js +13 -10
- package/packages/host/dist/sessions/drive.js.map +1 -1
- package/packages/host/dist/sessions/record.js +16 -17
- package/packages/host/dist/sessions/record.js.map +1 -1
- package/packages/host/dist/sessions/sidechannel.js +1 -1
- package/packages/host/dist/sessions/sidechannel.js.map +1 -1
- package/packages/host/dist/sessions/turn.js +5 -0
- package/packages/host/dist/sessions/turn.js.map +1 -1
- package/packages/host/dist/sessions.d.ts +2 -1
- package/packages/host/dist/sessions.js +1 -1
- package/packages/host/dist/sessions.js.map +1 -1
- package/packages/host/dist/settle.d.ts +3 -2
- package/packages/host/dist/settle.js +13 -13
- package/packages/host/dist/settle.js.map +1 -1
- package/packages/host/dist/sidecar/sidecarname.d.ts +2 -0
- package/packages/host/dist/sidecar/sidecarname.js +5 -1
- package/packages/host/dist/sidecar/sidecarname.js.map +1 -1
- package/packages/host/dist/sidecar/sidecarroute.d.ts +1 -1
- package/packages/host/dist/sidecar/sidecarroute.js +5 -0
- package/packages/host/dist/sidecar/sidecarroute.js.map +1 -1
- package/packages/host/dist/sidecar.d.ts +1 -1
- package/packages/host/dist/sidecar.js +1 -1
- package/packages/host/dist/sidecar.js.map +1 -1
- package/packages/host/dist/skills/skillinventory.d.ts +23 -0
- package/packages/host/dist/skills/skillinventory.js +275 -0
- package/packages/host/dist/skills/skillinventory.js.map +1 -0
- package/packages/host/dist/skills/skilllayers.d.ts +28 -0
- package/packages/host/dist/skills/skilllayers.js +73 -0
- package/packages/host/dist/skills/skilllayers.js.map +1 -0
- package/packages/host/dist/skills/skillrecommend.d.ts +42 -0
- package/packages/host/dist/skills/skillrecommend.js +171 -0
- package/packages/host/dist/skills/skillrecommend.js.map +1 -0
- package/packages/host/dist/skills/skillrefs.d.ts +2 -0
- package/packages/host/dist/skills/skillrefs.js +50 -0
- package/packages/host/dist/skills/skillrefs.js.map +1 -0
- package/packages/host/dist/skills/skilluse.d.ts +57 -0
- package/packages/host/dist/skills/skilluse.js +242 -0
- package/packages/host/dist/skills/skilluse.js.map +1 -0
- package/packages/host/dist/skills/skillweight.d.ts +18 -0
- package/packages/host/dist/skills/skillweight.js +69 -0
- package/packages/host/dist/skills/skillweight.js.map +1 -0
- package/packages/host/dist/skills/skillwrite.d.ts +56 -0
- package/packages/host/dist/skills/skillwrite.js +183 -0
- package/packages/host/dist/skills/skillwrite.js.map +1 -0
- package/packages/host/dist/sysstat.d.ts +34 -1
- package/packages/host/dist/sysstat.js +82 -14
- package/packages/host/dist/sysstat.js.map +1 -1
- package/packages/host/dist/tokenscan.js +5 -2
- package/packages/host/dist/tokenscan.js.map +1 -1
- package/packages/host/dist/tokenstats.js +7 -4
- package/packages/host/dist/tokenstats.js.map +1 -1
- package/packages/host/dist/transcript/transcriptparse.js +2 -2
- package/packages/host/dist/transcript/transcriptparse.js.map +1 -1
- package/packages/host/dist/waitclock.d.ts +12 -0
- package/packages/host/dist/waitclock.js +23 -0
- package/packages/host/dist/waitclock.js.map +1 -0
- package/packages/host/dist/worktreeleftover.js +13 -15
- package/packages/host/dist/worktreeleftover.js.map +1 -1
- package/packages/web/dist/assets/demo-DHkwSmU5.js +26 -0
- package/packages/web/dist/assets/{icons-D8RlmSLR.js → icons-5lVTFNUU.js} +1 -1
- package/packages/web/dist/assets/index-Bh4cH6X8.js +170 -0
- package/packages/web/dist/assets/index-F7VHtsLI.css +1 -0
- package/packages/web/dist/assets/shared-BvQMg9ra.js +51 -0
- package/packages/web/dist/assets/sheets-Cwi72V02.js +257 -0
- package/packages/web/dist/assets/sheets-DjU2XiUd.css +1 -0
- package/packages/web/dist/build-id.txt +1 -1
- package/packages/web/dist/buildstamp.json +1 -1
- package/packages/web/dist/index.html +7 -7
- package/packages/web/dist/sw.js +2 -2
- package/release.json +11 -3
- package/packages/web/dist/assets/demo-mKJo0QVO.js +0 -26
- package/packages/web/dist/assets/index-B6f7Lcp1.js +0 -170
- package/packages/web/dist/assets/index-DQIK94fc.css +0 -1
- package/packages/web/dist/assets/shared-Cd69oxHd.js +0 -51
- package/packages/web/dist/assets/sheets-BImsk1_Y.js +0 -256
- package/packages/web/dist/assets/sheets-DoUhPGK0.css +0 -1
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* submit ladder. Moved whole as the run's last statement
|
|
5
5
|
* (docs/notes/host-architecture.md, "The deliver slices").
|
|
6
6
|
*/
|
|
7
|
-
import { LOCAL_MOVE_POLLS, LOCAL_SUBMIT_TRIES, UNANNOUNCED_POLLS, UNANNOUNCED_TRIES
|
|
7
|
+
import { LOCAL_MOVE_POLLS, LOCAL_SUBMIT_TRIES, UNANNOUNCED_POLLS, UNANNOUNCED_TRIES } from "./deliverknobs.js";
|
|
8
|
+
import { realClock } from "../waitclock.js";
|
|
8
9
|
import { resolveBackend } from "../backends/index.js";
|
|
9
10
|
import { trustRule } from "../backends/derive.js";
|
|
10
11
|
import { readNavBox, trustKeys } from "../prompt.js";
|
|
@@ -40,9 +41,9 @@ const TRUST_PAINT_MS = 3000;
|
|
|
40
41
|
* rows are there; `1⏎` (`trustKeys(null)`) only beside a drawn "1. Yes", because on today's
|
|
41
42
|
* unnumbered box that Return lands on "No, exit" (docs/notes/host.md, `deliver.ts`).
|
|
42
43
|
*/
|
|
43
|
-
export async function trustAnswerKeys(read) {
|
|
44
|
+
export async function trustAnswerKeys(read, clock = realClock) {
|
|
44
45
|
let nav = readNavBox(await read());
|
|
45
|
-
for (let t =
|
|
46
|
+
for (let t = clock.now(); !nav && !NUMBERED_YES.test(await read()) && clock.now() - t < TRUST_PAINT_MS; await clock.sleep(150)) {
|
|
46
47
|
nav = readNavBox(await read());
|
|
47
48
|
}
|
|
48
49
|
if (nav)
|
|
@@ -58,15 +59,15 @@ export async function trustAnswerKeys(read) {
|
|
|
58
59
|
* words. Before (2026-10-31): the blind Return quit claude; with only the Return withheld, the
|
|
59
60
|
* session hung, since `settle.ts` can never call a delivery `absent` without a conversation log.
|
|
60
61
|
*/
|
|
61
|
-
export async function answerLateTrust(read, write) {
|
|
62
|
-
const { keys } = await trustAnswerKeys(read);
|
|
62
|
+
export async function answerLateTrust(read, write, clock = realClock) {
|
|
63
|
+
const { keys } = await trustAnswerKeys(read, clock);
|
|
63
64
|
if (!keys)
|
|
64
65
|
return { result: "retry", detail: "claude is asking whether to trust this folder and this app could not read the box — answer it in the terminal" };
|
|
65
66
|
write(keys);
|
|
66
67
|
return { result: "retry", detail: "claude asked whether to trust this folder after the words were typed — answered Yes, and the words go again" };
|
|
67
68
|
}
|
|
68
69
|
export async function submitAndConfirm(run) {
|
|
69
|
-
const { sessions, sessionId, text, historyKind, shape, note, snapshot, noTurn, unannounced, proof, ranAnyway } = run;
|
|
70
|
+
const { clock, sessions, sessionId, text, historyKind, shape, note, snapshot, noTurn, unannounced, proof, ranAnyway } = run;
|
|
70
71
|
const { armSourceProof, submitProof, proofKind, submitProofWithin } = proof;
|
|
71
72
|
// The text echoed in the composer ⇒ input is being accepted (NOT swallowed
|
|
72
73
|
// by a usage view / prompt). That's our delivery confirmation.
|
|
@@ -79,7 +80,7 @@ export async function submitAndConfirm(run) {
|
|
|
79
80
|
for (let i = 0; i < 6; i++) {
|
|
80
81
|
if ((sessions.idleMs(sessionId) ?? 999) >= 250)
|
|
81
82
|
break;
|
|
82
|
-
await sleep(150);
|
|
83
|
+
await clock.sleep(150);
|
|
83
84
|
}
|
|
84
85
|
// Submit — and, when the session can prove it, VERIFY the turn started.
|
|
85
86
|
//
|
|
@@ -138,7 +139,7 @@ export async function submitAndConfirm(run) {
|
|
|
138
139
|
sessions.write(sessionId, "\r");
|
|
139
140
|
let moved = false;
|
|
140
141
|
for (let i = 0; i < LOCAL_MOVE_POLLS && !moved; i++) {
|
|
141
|
-
await sleep(150);
|
|
142
|
+
await clock.sleep(150);
|
|
142
143
|
moved = (await snapshot()) !== before;
|
|
143
144
|
}
|
|
144
145
|
if (moved) {
|
|
@@ -257,7 +258,7 @@ export async function submitAndConfirm(run) {
|
|
|
257
258
|
for (let i = 0; i < 6; i++) {
|
|
258
259
|
if (sessions.isHooked(sessionId) && turnStarted())
|
|
259
260
|
return true;
|
|
260
|
-
await sleep(150);
|
|
261
|
+
await clock.sleep(150);
|
|
261
262
|
}
|
|
262
263
|
return false;
|
|
263
264
|
};
|
|
@@ -279,7 +280,7 @@ export async function submitAndConfirm(run) {
|
|
|
279
280
|
const before = sessions.scrollback(sessionId).length;
|
|
280
281
|
armSourceProof();
|
|
281
282
|
sessions.write(sessionId, "\r");
|
|
282
|
-
await sleep(700);
|
|
283
|
+
await clock.sleep(700);
|
|
283
284
|
if (sessions.scrollback(sessionId).length - before > 80)
|
|
284
285
|
break;
|
|
285
286
|
}
|
|
@@ -384,7 +385,7 @@ export async function submitAndConfirm(run) {
|
|
|
384
385
|
const composerLetGo = async () => {
|
|
385
386
|
for (let i = 0; i < 2; i++) {
|
|
386
387
|
if (i)
|
|
387
|
-
await sleep(300);
|
|
388
|
+
await clock.sleep(300);
|
|
388
389
|
if ((await composerHolds(sessions, sessionId, text)) === true)
|
|
389
390
|
return false;
|
|
390
391
|
}
|
|
@@ -398,7 +399,7 @@ export async function submitAndConfirm(run) {
|
|
|
398
399
|
// Poll instead of sleeping a fixed slice: the hook reports the turn start
|
|
399
400
|
// within milliseconds, so the common case costs one press and ~150 ms.
|
|
400
401
|
for (let i = 0; i < submitPolls && !submitted; i++) {
|
|
401
|
-
await sleep(150);
|
|
402
|
+
await clock.sleep(150);
|
|
402
403
|
submitted = turnStarted();
|
|
403
404
|
}
|
|
404
405
|
if (!submitted && boxBefore) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliverreturn.js","sourceRoot":"","sources":["../../src/deliver/deliverreturn.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"deliverreturn.js","sourceRoot":"","sources":["../../src/deliver/deliverreturn.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,8 @@ import { fixtureWanted, noteHealth } from "../clihealth.js";
|
|
|
2
2
|
import { asksYesNo } from "../shelllinks.js";
|
|
3
3
|
import { ROW_WINDOW, composerFramesAmbiguous } from "../composer.js";
|
|
4
4
|
import { deliveryCommandFacts, worksUnannounced } from "../slash.js";
|
|
5
|
-
import { CHANNEL_CONNECT_WAIT_MS, ECHO_WAIT_MS, PROMPT_HOOK_WAIT_MS
|
|
5
|
+
import { CHANNEL_CONNECT_WAIT_MS, ECHO_WAIT_MS, PROMPT_HOOK_WAIT_MS } from "./deliverknobs.js";
|
|
6
|
+
import { realClock } from "../waitclock.js";
|
|
6
7
|
import { composerHoldsOnlyHint, foreignInComposer, makeScreenReader } from "./deliverscreen.js";
|
|
7
8
|
import { makeLogProof, makeSubmitProof } from "./deliverproof.js";
|
|
8
9
|
import { answerLateTrust, hasTurns, submitAndConfirm, trustAnswerKeys, trustRuleFor } from "./deliverreturn.js";
|
|
@@ -14,6 +15,7 @@ import { answerLateTrust, hasTurns, submitAndConfirm, trustAnswerKeys, trustRule
|
|
|
14
15
|
* apart from yours" are the same enum and completely different events.
|
|
15
16
|
*/
|
|
16
17
|
export async function runDelivery(sessions, sessionId, text, historyKind, opts, key, shape) {
|
|
18
|
+
const clock = opts.clock ?? realClock;
|
|
17
19
|
/**
|
|
18
20
|
* File one health observation about THIS delivery — or file nothing, when the
|
|
19
21
|
* session's backend is outside the health record's scope.
|
|
@@ -67,11 +69,11 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
67
69
|
/** When this delivery began — the recency floor every log lookup below is
|
|
68
70
|
* matched against, so an identical prompt fired at the same session this
|
|
69
71
|
* morning can never be mistaken for proof about this one. */
|
|
70
|
-
const startedAt =
|
|
72
|
+
const startedAt = clock.now();
|
|
71
73
|
const shell = !hasTurns({ sessions, sessionId });
|
|
72
|
-
const { screen, probe, placeEcho, proven, snapshot, waitForEcho, lastSeen } = makeScreenReader(sessions, sessionId, text, key, shape, { firstLineProbe: shell && /[\r\n]/.test(text) });
|
|
73
|
-
const ranAnyway = makeLogProof(sessions, sessionId, text, startedAt, key);
|
|
74
|
-
const proof = makeSubmitProof(sessions, sessionId, text, startedAt);
|
|
74
|
+
const { screen, probe, placeEcho, proven, snapshot, waitForEcho, lastSeen } = makeScreenReader(sessions, sessionId, text, key, shape, { firstLineProbe: shell && /[\r\n]/.test(text) }, clock);
|
|
75
|
+
const ranAnyway = makeLogProof(sessions, sessionId, text, startedAt, key, clock);
|
|
76
|
+
const proof = makeSubmitProof(sessions, sessionId, text, startedAt, clock);
|
|
75
77
|
const { armSourceProof, proofKind, submitProofWithin } = proof;
|
|
76
78
|
/**
|
|
77
79
|
* Best-effort empty the composer. ctrl-U kills ONE line and an instruction
|
|
@@ -84,11 +86,11 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
84
86
|
// the user asked for that view.
|
|
85
87
|
if (esc) {
|
|
86
88
|
sessions.write(sessionId, "\x1b"); // Esc: close any open view/overlay
|
|
87
|
-
await sleep(150);
|
|
89
|
+
await clock.sleep(150);
|
|
88
90
|
}
|
|
89
91
|
for (let i = 0; i < 6; i++) {
|
|
90
92
|
sessions.write(sessionId, "\x15"); // ctrl-U: kill one input line
|
|
91
|
-
await sleep(120);
|
|
93
|
+
await clock.sleep(120);
|
|
92
94
|
}
|
|
93
95
|
};
|
|
94
96
|
// A TUI-local command (`/cost`, `/context`, `/resume`, …) opens a view instead
|
|
@@ -125,16 +127,16 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
125
127
|
* this ladder: one question asked before anything is typed.
|
|
126
128
|
*/
|
|
127
129
|
const channelHold = async () => {
|
|
128
|
-
const deadline =
|
|
130
|
+
const deadline = clock.now() + CHANNEL_CONNECT_WAIT_MS;
|
|
129
131
|
for (;;) {
|
|
130
132
|
if (!sessions.get(sessionId)?.running)
|
|
131
133
|
return null; // the not-running paths answer that
|
|
132
134
|
const hold = sessions.sendHold?.(sessionId) ?? null; // a test double may not have it
|
|
133
135
|
if (!hold)
|
|
134
136
|
return null;
|
|
135
|
-
if (!hold.connecting ||
|
|
137
|
+
if (!hold.connecting || clock.now() >= deadline)
|
|
136
138
|
return hold.sentence;
|
|
137
|
-
await sleep(250);
|
|
139
|
+
await clock.sleep(250);
|
|
138
140
|
}
|
|
139
141
|
};
|
|
140
142
|
{
|
|
@@ -154,13 +156,13 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
154
156
|
if ((sessions.idleMs(sessionId) ?? 0) >= 250)
|
|
155
157
|
settled = true;
|
|
156
158
|
else
|
|
157
|
-
await sleep(150);
|
|
159
|
+
await clock.sleep(150);
|
|
158
160
|
}
|
|
159
161
|
// Not settled after 6 s means a TUI that simply never stops repainting (a
|
|
160
162
|
// spinner does exactly that). Type anyway — the echo check below is what
|
|
161
163
|
// decides whether it landed, and waiting longer buys nothing.
|
|
162
164
|
}
|
|
163
|
-
else if (!(await sessions.waitReady(sessionId, 1200, 45000))) {
|
|
165
|
+
else if (!(await sessions.waitReady(sessionId, 1200, 45000, clock))) {
|
|
164
166
|
// 45 s, not 30: a fan-out boots several `claude` processes at once, and the
|
|
165
167
|
// last batch on a loaded machine can take well over half a minute to draw
|
|
166
168
|
// its first prompt. Timing out early is what leaves a repo silently un-fed.
|
|
@@ -214,7 +216,7 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
214
216
|
if (!shell && trust.asks(await screen())) {
|
|
215
217
|
if (!trust.autoAccept)
|
|
216
218
|
return { result: "retry", detail: trust.refusal };
|
|
217
|
-
const { keys, nav } = await trustAnswerKeys(() => sessions.screenText(sessionId, 60));
|
|
219
|
+
const { keys, nav } = await trustAnswerKeys(() => sessions.screenText(sessionId, 60), clock);
|
|
218
220
|
if (!keys || (!nav && /noexit/.test(await screen()))) {
|
|
219
221
|
return { result: "retry", detail: "claude is asking whether to trust this folder and this app could not read the box — answer it in the terminal" };
|
|
220
222
|
}
|
|
@@ -222,14 +224,14 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
222
224
|
// Quiet is not ready here: claude boots AFTER the Yes, and words typed into
|
|
223
225
|
// that boot vanish (measured on 2.1.296 — an empty composer, `unconfirmed`).
|
|
224
226
|
// Wait for the composer's own status line, the box gone, then settle.
|
|
225
|
-
for (let t =
|
|
227
|
+
for (let t = clock.now(); clock.now() - t < 20000; await clock.sleep(200)) {
|
|
226
228
|
if (!sessions.get(sessionId)?.running)
|
|
227
229
|
return { result: "retry" };
|
|
228
230
|
const now = await screen();
|
|
229
231
|
if (/shifttabtocycle|forshortcuts/.test(now) && !/trustthisfolder|noexit/.test(now))
|
|
230
232
|
break;
|
|
231
233
|
}
|
|
232
|
-
await sessions.waitReady(sessionId, 1500, 20000);
|
|
234
|
+
await sessions.waitReady(sessionId, 1500, 20000, clock);
|
|
233
235
|
}
|
|
234
236
|
// Type with echo verification, and type AT MOST ONCE.
|
|
235
237
|
//
|
|
@@ -378,9 +380,9 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
378
380
|
let mixedUp = null;
|
|
379
381
|
const trustUp = !shell && trust.asks(await screen()); // a box painted over the words: cursor on "No, exit"
|
|
380
382
|
if (trustUp && trust.autoAccept)
|
|
381
|
-
return answerLateTrust(() => sessions.screenText(sessionId, 60), (k) => sessions.write(sessionId, k));
|
|
383
|
+
return answerLateTrust(() => sessions.screenText(sessionId, 60), (k) => sessions.write(sessionId, k), clock);
|
|
382
384
|
if (!noTurn && !trustUp && (sessions.isHooked(sessionId) || proof.deliverySrc)) {
|
|
383
|
-
const pressedAt =
|
|
385
|
+
const pressedAt = clock.now();
|
|
384
386
|
armSourceProof();
|
|
385
387
|
sessions.write(sessionId, "\r");
|
|
386
388
|
if (await submitProofWithin(PROMPT_HOOK_WAIT_MS)) {
|
|
@@ -490,6 +492,6 @@ export async function runDelivery(sessions, sessionId, text, historyKind, opts,
|
|
|
490
492
|
shape.echo = before;
|
|
491
493
|
note("deliver.echo", "good", await echoFixture());
|
|
492
494
|
}
|
|
493
|
-
return submitAndConfirm({ sessions, sessionId, text, historyKind, shape, note, snapshot, noTurn, unannounced, proof, ranAnyway });
|
|
495
|
+
return submitAndConfirm({ clock, sessions, sessionId, text, historyKind, shape, note, snapshot, noTurn, unannounced, proof, ranAnyway });
|
|
494
496
|
}
|
|
495
497
|
//# sourceMappingURL=deliverrun.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliverrun.js","sourceRoot":"","sources":["../../src/deliver/deliverrun.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deliverrun.js","sourceRoot":"","sources":["../../src/deliver/deliverrun.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import type { SessionManager } from "../sessions.js";
|
|
|
7
7
|
import type { DeliveryShape } from "@waterplane/shared";
|
|
8
8
|
import type { EchoRule } from "../echo.js";
|
|
9
9
|
import type { ComposerAnchors } from "../composer.js";
|
|
10
|
+
import { type Clock } from "../waitclock.js";
|
|
10
11
|
/**
|
|
11
12
|
* The anchors the session's OWN descriptor finds its composer by (absent id ⇒
|
|
12
13
|
* claude, as everywhere) — or null when there is no reader: a backend this host
|
|
@@ -65,7 +66,7 @@ export declare function makeScreenReader(sessions: SessionManager, sessionId: st
|
|
|
65
66
|
* head that straddles the newline is on no single row (`PROBE_LEN`). */
|
|
66
67
|
opts?: {
|
|
67
68
|
firstLineProbe?: boolean;
|
|
68
|
-
}): {
|
|
69
|
+
}, clock?: Clock): {
|
|
69
70
|
screen: () => Promise<string>;
|
|
70
71
|
probe: string;
|
|
71
72
|
placeEcho: (raw: readonly string[], newestOnly: boolean) => EchoRule;
|
|
@@ -2,7 +2,8 @@ import { PASTE_CHIT, pastedNewlines, pasteCollapsible, echoAmbiguous, echoProbe,
|
|
|
2
2
|
import { FALLBACK_ROWS, ROW_WINDOW, composerAnchorsFor, composerEcho, composerHeld, composerReading, liveComposerEcho, } from "../composer.js";
|
|
3
3
|
import { rivalTexts } from "../opendeliveries.js";
|
|
4
4
|
import { resolveBackend } from "../backends/index.js";
|
|
5
|
-
import { FALLBACK_HOLD_MS
|
|
5
|
+
import { FALLBACK_HOLD_MS } from "./deliverknobs.js";
|
|
6
|
+
import { realClock } from "../waitclock.js";
|
|
6
7
|
/** A prompt this long whose words contain the held text whole is our own text
|
|
7
8
|
* drawn in a way no echo rule placed (a viewport slice under `SLICE_MIN`) —
|
|
8
9
|
* left to the paths that existed before. Short holdings (`y`) never qualify:
|
|
@@ -105,7 +106,7 @@ export function makeScreenReader(sessions, sessionId, text, key, shape,
|
|
|
105
106
|
/** A SHELL's multi-line paste: the shell draws each line on its own row with
|
|
106
107
|
* nothing spliced between, so the needle is cut from the FIRST line — a
|
|
107
108
|
* head that straddles the newline is on no single row (`PROBE_LEN`). */
|
|
108
|
-
opts = {}) {
|
|
109
|
+
opts = {}, clock = realClock) {
|
|
109
110
|
// Detection reads the RENDERED current screen, not an ANSI-stripped byte
|
|
110
111
|
// window. One claude-TUI repaint of a busy screen is tens of KB, so every
|
|
111
112
|
// byte window is wrong in one direction or the other: too small and text
|
|
@@ -379,7 +380,7 @@ opts = {}) {
|
|
|
379
380
|
* the composer of a session that was working fine.
|
|
380
381
|
*/
|
|
381
382
|
const waitForEcho = async (ms) => {
|
|
382
|
-
const deadline =
|
|
383
|
+
const deadline = clock.now() + ms;
|
|
383
384
|
let heldSince;
|
|
384
385
|
for (;;) {
|
|
385
386
|
// `proven`, not merely "matched": a prefix hit that a rival could equally
|
|
@@ -403,9 +404,9 @@ opts = {}) {
|
|
|
403
404
|
// accepted if no frame ever comes (a stub, an unrecognised redraw), so
|
|
404
405
|
// nothing that degraded to it before stops delivering.
|
|
405
406
|
if (proven(rule) && fellBack && fullReader) {
|
|
406
|
-
heldSince ??=
|
|
407
|
-
if (
|
|
408
|
-
await sleep(200);
|
|
407
|
+
heldSince ??= clock.now();
|
|
408
|
+
if (clock.now() - heldSince < FALLBACK_HOLD_MS && clock.now() < deadline) {
|
|
409
|
+
await clock.sleep(200);
|
|
409
410
|
continue;
|
|
410
411
|
}
|
|
411
412
|
}
|
|
@@ -413,11 +414,11 @@ opts = {}) {
|
|
|
413
414
|
shape.echo = rule;
|
|
414
415
|
return true;
|
|
415
416
|
}
|
|
416
|
-
if (
|
|
417
|
+
if (clock.now() >= deadline) {
|
|
417
418
|
shape.echo = "none";
|
|
418
419
|
return false;
|
|
419
420
|
}
|
|
420
|
-
await sleep(200);
|
|
421
|
+
await clock.sleep(200);
|
|
421
422
|
}
|
|
422
423
|
};
|
|
423
424
|
return { screen, probe, placeEcho, proven, snapshot, waitForEcho, lastSeen: () => seen };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliverscreen.js","sourceRoot":"","sources":["../../src/deliver/deliverscreen.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deliverscreen.js","sourceRoot":"","sources":["../../src/deliver/deliverscreen.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
import type { DeliveryShape, HistoryEntry, SendView, SentCommand, SentSource } from "@waterplane/shared";
|
|
6
6
|
import type { SessionManager } from "../sessions.js";
|
|
7
7
|
import type { noteHealth } from "../clihealth.js";
|
|
8
|
+
import type { Clock } from "../waitclock.js";
|
|
8
9
|
import type { makeLogProof, makeSubmitProof } from "./deliverproof.js";
|
|
9
10
|
/** What a delivery attempt did — see `deliverPrompt()` for the contract. */
|
|
10
11
|
export type DeliveryResult = "ok" | "retry" | "unconfirmed" | "unsubmitted";
|
|
@@ -39,6 +40,8 @@ export type DeliveryResult = "ok" | "retry" | "unconfirmed" | "unsubmitted";
|
|
|
39
40
|
* rule failing. See the submit branch in `runDelivery`.
|
|
40
41
|
*/
|
|
41
42
|
export interface DeliverOpts {
|
|
43
|
+
/** The clock every wait in the ladder reads (default `realClock`); a test hands in virtual time. */
|
|
44
|
+
clock?: Clock;
|
|
42
45
|
/** Human-typed: don't wait for the turn to end (see above). */
|
|
43
46
|
interactive?: boolean;
|
|
44
47
|
/**
|
|
@@ -105,6 +108,7 @@ export interface DeliverOpts {
|
|
|
105
108
|
* through `proof`'s getters, never copied out.
|
|
106
109
|
*/
|
|
107
110
|
export interface DeliveryRun {
|
|
111
|
+
clock: Clock;
|
|
108
112
|
sessions: SessionManager;
|
|
109
113
|
sessionId: string;
|
|
110
114
|
text: string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { noteAmbiguousDelivery, noteDeliveryEnded, noteDeliveryStarted } from "./opendeliveries.js";
|
|
2
2
|
import { recordSent } from "./sentlog.js";
|
|
3
3
|
import { runDelivery } from "./deliver/deliverrun.js";
|
|
4
|
+
import { realClock } from "./waitclock.js";
|
|
4
5
|
/**
|
|
5
6
|
* Deliver instruction text into a session as if typed + Enter, and CONFIRM it
|
|
6
7
|
* landed:
|
|
@@ -55,7 +56,7 @@ export async function deliverToNewSession(sessions, sessionId, text, historyKind
|
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
58
|
export async function deliverPrompt(sessions, sessionId, text, historyKind = "backlog", opts = {}) {
|
|
58
|
-
const startedAt =
|
|
59
|
+
const startedAt = (opts.clock ?? realClock).now();
|
|
59
60
|
/**
|
|
60
61
|
* This delivery's stable name, for the two ledgers that must be able to tell
|
|
61
62
|
* one delivery from another: the spent-turn ledger (`settle.ts`) and the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver.js","sourceRoot":"","sources":["../src/deliver.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"deliver.js","sourceRoot":"","sources":["../src/deliver.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,10 +62,21 @@
|
|
|
62
62
|
* accident, and why the log line still never carries the words.
|
|
63
63
|
*/
|
|
64
64
|
import { type DictateAnswer, type DictateStatus } from "@waterplane/shared";
|
|
65
|
+
/** Where a model lives when nobody said. XDG, because a 1.6 GB weights file is
|
|
66
|
+
* machine state and not repo state — nothing under `.waterplane/` is the right home
|
|
67
|
+
* for it, and a second copy per repo is 1.6 GB per repo. */
|
|
68
|
+
export declare function modelDir(): string;
|
|
69
|
+
export declare function binary(): string;
|
|
65
70
|
/** The model file, or null. An explicit `WATERPLANE_WHISPER_MODEL` is taken as said —
|
|
66
71
|
* including its absence, which is a misconfiguration worth naming rather than
|
|
67
72
|
* papering over with a scan that finds something else. */
|
|
68
73
|
export declare function modelPath(): string | null;
|
|
74
|
+
/** The command to run for `bin`: itself when the OS finds it (or it is a path), else an
|
|
75
|
+
* absolute path inside a brew dir, else null. Cached until `resetEngineCache`. */
|
|
76
|
+
export declare function resolveBin(bin: string): string | null;
|
|
77
|
+
export declare function onPath(bin: string): boolean;
|
|
78
|
+
/** Forget the cached PATH lookup — after a setup installed the binary. */
|
|
79
|
+
export declare function resetEngineCache(): void;
|
|
69
80
|
/** What to say about a missing engine: brew on macOS, a generic line elsewhere. */
|
|
70
81
|
export declare function whisperInstallHint(platform?: string): string;
|
|
71
82
|
/**
|
|
@@ -73,11 +73,11 @@ const DEFAULT_BIN = "whisper-cli";
|
|
|
73
73
|
/** Where a model lives when nobody said. XDG, because a 1.6 GB weights file is
|
|
74
74
|
* machine state and not repo state — nothing under `.waterplane/` is the right home
|
|
75
75
|
* for it, and a second copy per repo is 1.6 GB per repo. */
|
|
76
|
-
function modelDir() {
|
|
76
|
+
export function modelDir() {
|
|
77
77
|
const xdg = (process.env.XDG_DATA_HOME || "").trim();
|
|
78
78
|
return xdg ? join(resolve(xdg), BRAND.configDirName, "models") : join(homedir(), ".local", "share", BRAND.configDirName, "models");
|
|
79
79
|
}
|
|
80
|
-
function binary() {
|
|
80
|
+
export function binary() {
|
|
81
81
|
return (env("WHISPER_BIN") || "").trim() || DEFAULT_BIN;
|
|
82
82
|
}
|
|
83
83
|
/** The model file, or null. An explicit `WATERPLANE_WHISPER_MODEL` is taken as said —
|
|
@@ -106,25 +106,35 @@ export function modelPath() {
|
|
|
106
106
|
const pick = turbo.find((n) => !/q\d/.test(n)) || turbo[0] || ggml[0];
|
|
107
107
|
return join(modelDir(), pick);
|
|
108
108
|
}
|
|
109
|
+
/** Where Homebrew puts binaries: a launchd daemon's PATH usually lacks both. */
|
|
110
|
+
const BREW_BIN_DIRS = ["/opt/homebrew/bin", "/usr/local/bin"];
|
|
109
111
|
let whichCache = null;
|
|
110
|
-
|
|
112
|
+
/** The command to run for `bin`: itself when the OS finds it (or it is a path), else an
|
|
113
|
+
* absolute path inside a brew dir, else null. Cached until `resetEngineCache`. */
|
|
114
|
+
export function resolveBin(bin) {
|
|
111
115
|
if (whichCache && whichCache.bin === bin)
|
|
112
|
-
return whichCache.
|
|
116
|
+
return whichCache.resolved;
|
|
113
117
|
// The OS's own lookup rather than a PATH walk: it honours the shell's rules,
|
|
114
118
|
// and this runs once per status read, not per dictation. `where` on Windows
|
|
115
119
|
// — `which` is not a program there, so asking for it would report every
|
|
116
120
|
// Windows desktop as having no transcriber whether or not it has one.
|
|
117
|
-
let
|
|
121
|
+
let resolved = null;
|
|
118
122
|
try {
|
|
119
123
|
execFileSync(process.platform === "win32" ? "where" : "which", [bin], { stdio: ["ignore", "ignore", "ignore"] });
|
|
120
|
-
|
|
124
|
+
resolved = bin;
|
|
121
125
|
}
|
|
122
126
|
catch {
|
|
123
|
-
|
|
127
|
+
if (process.platform === "darwin" && !bin.includes("/")) {
|
|
128
|
+
const hit = BREW_BIN_DIRS.map((d) => join(d, bin)).find((p) => existsSync(p));
|
|
129
|
+
resolved = hit ?? null;
|
|
130
|
+
}
|
|
124
131
|
}
|
|
125
|
-
whichCache = { bin,
|
|
126
|
-
return
|
|
132
|
+
whichCache = { bin, resolved };
|
|
133
|
+
return resolved;
|
|
127
134
|
}
|
|
135
|
+
export function onPath(bin) { return resolveBin(bin) !== null; }
|
|
136
|
+
/** Forget the cached PATH lookup — after a setup installed the binary. */
|
|
137
|
+
export function resetEngineCache() { whichCache = null; }
|
|
128
138
|
/** What to say about a missing engine: brew on macOS, a generic line elsewhere. */
|
|
129
139
|
export function whisperInstallHint(platform = process.platform) {
|
|
130
140
|
return platform === "darwin"
|
|
@@ -368,7 +378,7 @@ export async function transcribe(wav, opts = {}) {
|
|
|
368
378
|
// `ENOENT … /var/folders/…/out.json`: a temp path nobody can act on, about
|
|
369
379
|
// a file that was never the problem. What whisper SAID is the answer.
|
|
370
380
|
const said = await new Promise((ok, fail) => {
|
|
371
|
-
const child = execFile(binary(), [
|
|
381
|
+
const child = execFile(resolveBin(binary()) ?? binary(), [
|
|
372
382
|
"-m", model,
|
|
373
383
|
"-l", lang,
|
|
374
384
|
"-t", String(threads()),
|