castle-web-cli 0.4.231 → 0.4.233
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-failures.d.ts +8 -0
- package/dist/agent-failures.js +19 -2
- package/dist/agent-prompts.d.ts +1 -1
- package/dist/agent-prompts.js +10 -3
- package/dist/agent.d.ts +64 -3
- package/dist/agent.js +170 -81
- package/dist/castle-host/host.d.ts +1 -0
- package/dist/castle-host/host.js +51 -3
- package/dist/castleJson.d.ts +4 -2
- package/dist/castleJson.js +2 -0
- package/dist/check.d.ts +3 -1
- package/dist/check.js +11 -1
- package/dist/devSessionStorage.js +47 -1
- package/dist/importPinMismatch.d.ts +22 -0
- package/dist/importPinMismatch.js +77 -0
- package/dist/importRegression.js +3 -15
- package/dist/imports.d.ts +10 -3
- package/dist/imports.js +88 -20
- package/dist/index.js +5 -4
- package/dist/init.js +1 -1
- package/dist/platformDoc.js +22 -0
- package/dist/routerFences.d.ts +5 -0
- package/dist/routerFences.js +12 -2
- package/dist/save-deck.d.ts +5 -0
- package/dist/save-deck.js +37 -4
- package/dist/serve.js +3 -0
- package/dist/serverBundle.js +5 -3
- package/dist/shell/assets/{index-D2tWM896.js → index-BjOxR-lW.js} +4 -4
- package/dist/shell/assets/index-MVLfNYd9.css +1 -0
- package/dist/shell/index.html +2 -2
- package/dist/taskSteer.d.ts +13 -0
- package/dist/taskSteer.js +22 -2
- package/kits/base/castle.json +1 -1
- package/kits/base/package-lock.json +1 -1
- package/kits/base/sdk/README.md +79 -2
- package/kits/base/sdk/avatar.d.ts +6 -2
- package/kits/base/sdk/avatar.js +12 -4
- package/kits/base/sdk/castle.d.ts +1 -1
- package/kits/base/sdk/commands.d.ts +14 -0
- package/kits/base/sdk/hub.d.ts +6 -2
- package/kits/base/sdk/hub.js +13 -0
- package/kits/base/sdk/multiplayer.js +17 -1
- package/kits/base/sdk/save.js +2 -1
- package/kits/base/sdk/server/hub.d.ts +87 -0
- package/kits/base/sdk/server/hub.js +70 -0
- package/kits/base/sdk/server/platformHandle.d.ts +31 -1
- package/kits/base/sdk/server/storage.d.ts +13 -0
- package/kits/base/sdk/server/storage.js +46 -0
- package/kits/base/sdk/server/wrapper.d.ts +36 -5
- package/kits/base/sdk/server/wrapper.js +83 -8
- package/kits/hub-game/CLAUDE.md +352 -12
- package/kits/hub-game/blueprints/avatar-10.scene +28 -0
- package/kits/hub-game/blueprints/avatar-11.scene +28 -0
- package/kits/hub-game/blueprints/avatar-12.scene +28 -0
- package/kits/hub-game/blueprints/avatar-13.scene +28 -0
- package/kits/hub-game/blueprints/avatar-14.scene +28 -0
- package/kits/hub-game/blueprints/avatar-15.scene +28 -0
- package/kits/hub-game/blueprints/avatar-4.scene +28 -0
- package/kits/hub-game/blueprints/avatar-5.scene +28 -0
- package/kits/hub-game/blueprints/avatar-6.scene +28 -0
- package/kits/hub-game/blueprints/avatar-7.scene +28 -0
- package/kits/hub-game/blueprints/avatar-8.scene +28 -0
- package/kits/hub-game/blueprints/avatar-9.scene +28 -0
- package/kits/hub-game/code/client/actorBudget.js +47 -0
- package/kits/hub-game/code/client/attention.js +11 -2
- package/kits/hub-game/code/client/avatar.js +345 -32
- package/kits/hub-game/code/client/avatarCap.js +228 -0
- package/kits/hub-game/code/client/avatarColors.js +70 -0
- package/kits/hub-game/code/client/avatarFaces.js +21 -0
- package/kits/hub-game/code/client/avatarShare.js +251 -0
- package/kits/hub-game/code/client/ballot.js +467 -0
- package/kits/hub-game/code/client/build.js +22 -0
- package/kits/hub-game/code/client/chat.js +12 -0
- package/kits/hub-game/code/client/chrome.js +1334 -50
- package/kits/hub-game/code/client/companion.js +716 -0
- package/kits/hub-game/code/client/companionDress.js +99 -0
- package/kits/hub-game/code/client/decor.js +509 -0
- package/kits/hub-game/code/client/earned.js +131 -0
- package/kits/hub-game/code/client/emoteBubble.js +75 -0
- package/kits/hub-game/code/client/grab.js +363 -20
- package/kits/hub-game/code/client/hats.js +26 -0
- package/kits/hub-game/code/client/hookLayer.js +328 -15
- package/kits/hub-game/code/client/hudClear.js +126 -0
- package/kits/hub-game/code/client/idle.js +163 -22
- package/kits/hub-game/code/client/interestCap.js +81 -0
- package/kits/hub-game/code/client/keys.js +36 -0
- package/kits/hub-game/code/client/labelsNear.js +205 -0
- package/kits/hub-game/code/client/menuIcons.js +34 -0
- package/kits/hub-game/code/client/pack.js +6 -2
- package/kits/hub-game/code/client/packFormat.js +3 -3
- package/kits/hub-game/code/client/rehello.js +167 -0
- package/kits/hub-game/code/client/shot.js +92 -0
- package/kits/hub-game/code/client/sound.js +63 -8
- package/kits/hub-game/code/client/soundscape.js +1151 -0
- package/kits/hub-game/code/client/soundscapeActions.js +99 -0
- package/kits/hub-game/code/client/soundscapeAmbience.js +453 -0
- package/kits/hub-game/code/client/soundscapeBaked.js +143 -0
- package/kits/hub-game/code/client/soundscapeBusker.js +217 -0
- package/kits/hub-game/code/client/soundscapeCourt.js +200 -0
- package/kits/hub-game/code/client/soundscapeCrowd.js +331 -0
- package/kits/hub-game/code/client/soundscapeCues.js +362 -0
- package/kits/hub-game/code/client/soundscapeMap.js +181 -0
- package/kits/hub-game/code/client/soundscapeMarket.js +176 -0
- package/kits/hub-game/code/client/soundscapeMusic.js +126 -0
- package/kits/hub-game/code/client/soundscapeMusicEngine.js +460 -0
- package/kits/hub-game/code/client/soundscapeSimlish.js +737 -0
- package/kits/hub-game/code/client/soundscapeSongs.js +127 -0
- package/kits/hub-game/code/client/soundscapeSongsRound3.js +63 -0
- package/kits/hub-game/code/client/soundscapeSynthesis.js +168 -0
- package/kits/hub-game/code/client/soundscapeUi.js +211 -0
- package/kits/hub-game/code/client/soundscapeVoice.js +1209 -0
- package/kits/hub-game/code/client/soundscapeWaves.js +206 -0
- package/kits/hub-game/code/client/spin.js +101 -0
- package/kits/hub-game/code/client/state.js +131 -1
- package/kits/hub-game/code/client/stuck.js +259 -0
- package/kits/hub-game/code/client/talk.js +538 -47
- package/kits/hub-game/code/client/tiers.js +541 -27
- package/kits/hub-game/code/client/toastBand.js +37 -0
- package/kits/hub-game/code/client/together.js +98 -1
- package/kits/hub-game/code/client/visibility.js +43 -0
- package/kits/hub-game/code/client/wear.js +470 -97
- package/kits/hub-game/code/client/yours.js +199 -0
- package/kits/hub-game/code/companionSpec.js +45 -0
- package/kits/hub-game/code/privateText.js +7 -0
- package/kits/hub-game/code/server/actions.js +133 -0
- package/kits/hub-game/code/server/actors.js +14 -1
- package/kits/hub-game/code/server/ask.js +155 -0
- package/kits/hub-game/code/server/ballot.js +539 -0
- package/kits/hub-game/code/server/cells.js +100 -0
- package/kits/hub-game/code/server/companion.js +82 -0
- package/kits/hub-game/code/server/cues.js +70 -0
- package/kits/hub-game/code/server/decor.js +269 -0
- package/kits/hub-game/code/server/earned.js +461 -0
- package/kits/hub-game/code/server/friendBests.js +166 -0
- package/kits/hub-game/code/server/friendsAmong.js +232 -0
- package/kits/hub-game/code/server/grab.js +296 -11
- package/kits/hub-game/code/server/history.js +5 -0
- package/kits/hub-game/code/server/hub.js +1317 -52
- package/kits/hub-game/code/server/idle.js +30 -11
- package/kits/hub-game/code/server/index.js +2 -2
- package/kits/hub-game/code/server/labels.js +28 -2
- package/kits/hub-game/code/server/manifest.js +424 -8
- package/kits/hub-game/code/server/menu.js +133 -0
- package/kits/hub-game/code/server/npcs.js +830 -80
- package/kits/hub-game/code/server/party.js +13 -2
- package/kits/hub-game/code/server/players.js +22 -0
- package/kits/hub-game/code/server/say.js +8 -2
- package/kits/hub-game/code/server/shot.js +110 -0
- package/kits/hub-game/code/server/standing.js +124 -0
- package/kits/hub-game/code/server/vis.js +113 -0
- package/kits/hub-game/code/server/wear.js +128 -11
- package/kits/hub-game/code/server/yours.js +59 -0
- package/kits/hub-game/code/shared/cues.js +9 -0
- package/kits/hub-game/code/shared/decor.js +41 -0
- package/kits/hub-game/code/shared/shot.js +19 -0
- package/kits/hub-game/code/shared/spin.js +57 -0
- package/kits/hub-game/code/systems/hub.js +1083 -85
- package/kits/hub-game/docs/content-pack.md +1 -1
- package/kits/hub-game/docs/contract.md +2440 -61
- package/kits/hub-game/docs/home-pieces.md +64 -0
- package/kits/hub-game/models/avatar-10.pxmodel +28 -0
- package/kits/hub-game/models/avatar-11.pxmodel +28 -0
- package/kits/hub-game/models/avatar-12.pxmodel +27 -0
- package/kits/hub-game/models/avatar-13.pxmodel +24 -0
- package/kits/hub-game/models/avatar-14.pxmodel +29 -0
- package/kits/hub-game/models/avatar-15.pxmodel +24 -0
- package/kits/hub-game/models/avatar-4.pxmodel +29 -0
- package/kits/hub-game/models/avatar-5.pxmodel +27 -0
- package/kits/hub-game/models/avatar-6.pxmodel +26 -0
- package/kits/hub-game/models/avatar-7.pxmodel +25 -0
- package/kits/hub-game/models/avatar-8.pxmodel +24 -0
- package/kits/hub-game/models/avatar-9.pxmodel +30 -0
- package/kits/hub-game/models/earned/badge-round.pxmodel +100 -0
- package/kits/hub-game/models/earned/badge-shield.pxmodel +117 -0
- package/kits/hub-game/models/earned/badge-star.pxmodel +87 -0
- package/kits/hub-game/models/earned/belt-plain.pxmodel +72 -0
- package/kits/hub-game/models/earned/held-ball.pxmodel +43 -0
- package/kits/hub-game/models/earned/held-lantern.pxmodel +85 -0
- package/kits/hub-game/models/earned/held-net.pxmodel +57 -0
- package/kits/hub-game/models/earned/held-trophy.pxmodel +109 -0
- package/kits/hub-game/models/earned/pin-round.pxmodel +62 -0
- package/kits/hub-game/models/earned/sash-plain.pxmodel +66 -0
- package/kits/hub-game/models/earned/square/belt-plain.pxmodel +104 -0
- package/kits/hub-game/models/earned/square/sash-plain.pxmodel +98 -0
- package/kits/hub-game/models/hats/bat-clip.pxmodel +206 -0
- package/kits/hub-game/models/hats/beekeeper.pxmodel +149 -0
- package/kits/hub-game/models/hats/cap.pxmodel +162 -0
- package/kits/hub-game/models/hats/captain.pxmodel +178 -0
- package/kits/hub-game/models/hats/crooked-top.pxmodel +172 -0
- package/kits/hub-game/models/hats/flower-crown.pxmodel +451 -0
- package/kits/hub-game/models/hats/foam-crown.pxmodel +179 -0
- package/kits/hub-game/models/hats/lantern.pxmodel +230 -0
- package/kits/hub-game/models/hats/laurel.pxmodel +533 -0
- package/kits/hub-game/models/hats/lighthouse.pxmodel +96 -0
- package/kits/hub-game/models/hats/sailor.pxmodel +141 -0
- package/kits/hub-game/models/hats/souwester.pxmodel +131 -0
- package/kits/hub-game/models/hats/straw.pxmodel +139 -0
- package/kits/hub-game/models/hats/sunflower.pxmodel +406 -0
- package/kits/hub-game/models/hats/sweatband.pxmodel +112 -0
- package/kits/hub-game/models/hats/witch.pxmodel +147 -0
- package/kits/hub-game/package-lock.json +2 -0
- package/kits/hub-game/package.json +2 -1
- package/kits/hub-game/scripts/check.mjs +78 -11
- package/kits/hub-game/scripts/companion-follower-wire.json +1 -0
- package/kits/hub-game/scripts/fixtures/decor-keyless-draw.json +121 -0
- package/kits/hub-game/scripts/fixtures/decor-keyless.json +293 -0
- package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +23 -0
- package/kits/hub-game/scripts/fixtures/fake-dom.mjs +107 -0
- package/kits/hub-game/scripts/fixtures/interest-legacy.json +385 -0
- package/kits/hub-game/scripts/fixtures/npc-notes-v1.77.jsonl +4 -0
- package/kits/hub-game/scripts/fixtures/vis-shared-wire.json +1 -0
- package/kits/hub-game/scripts/gen-avatars.mjs +933 -16
- package/kits/hub-game/scripts/gen-earned.mjs +285 -0
- package/kits/hub-game/scripts/gen-hats.mjs +827 -0
- package/kits/hub-game/scripts/grab.before-orbit.mjs +400 -0
- package/kits/hub-game/scripts/soundscape-wave-analysis.mjs +125 -0
- package/kits/hub-game/scripts/test-actions-client.mjs +488 -0
- package/kits/hub-game/scripts/test-actions.mjs +298 -0
- package/kits/hub-game/scripts/test-actor-budget.mjs +44 -0
- package/kits/hub-game/scripts/test-actors.mjs +19 -17
- package/kits/hub-game/scripts/test-ask-client.mjs +358 -0
- package/kits/hub-game/scripts/test-ask.mjs +269 -0
- package/kits/hub-game/scripts/test-attention.mjs +10 -1
- package/kits/hub-game/scripts/test-avatar-cap.mjs +379 -0
- package/kits/hub-game/scripts/test-avatar-colors.mjs +72 -0
- package/kits/hub-game/scripts/test-avatar-models.mjs +181 -0
- package/kits/hub-game/scripts/test-avatar-share.mjs +318 -0
- package/kits/hub-game/scripts/test-avatar-wire.mjs +753 -0
- package/kits/hub-game/scripts/test-avatar.mjs +540 -7
- package/kits/hub-game/scripts/test-ballot.mjs +1001 -0
- package/kits/hub-game/scripts/test-build.mjs +31 -0
- package/kits/hub-game/scripts/test-cells.mjs +71 -0
- package/kits/hub-game/scripts/test-chat.mjs +694 -0
- package/kits/hub-game/scripts/test-classic.mjs +2 -0
- package/kits/hub-game/scripts/test-companion-chat.mjs +198 -0
- package/kits/hub-game/scripts/test-companion-client.mjs +1167 -0
- package/kits/hub-game/scripts/test-companion.mjs +259 -0
- package/kits/hub-game/scripts/test-decor-client.mjs +303 -0
- package/kits/hub-game/scripts/test-decor.mjs +457 -0
- package/kits/hub-game/scripts/test-earned-client.mjs +459 -0
- package/kits/hub-game/scripts/test-earned.mjs +1194 -0
- package/kits/hub-game/scripts/test-emote-bubble.mjs +110 -0
- package/kits/hub-game/scripts/test-friend-bests.mjs +435 -0
- package/kits/hub-game/scripts/test-grab-client.mjs +186 -3
- package/kits/hub-game/scripts/test-grab-orbit.mjs +918 -0
- package/kits/hub-game/scripts/test-grab.mjs +864 -3
- package/kits/hub-game/scripts/test-hats.mjs +483 -0
- package/kits/hub-game/scripts/test-hub-leaving.mjs +203 -0
- package/kits/hub-game/scripts/test-hub-ops.mjs +439 -2
- package/kits/hub-game/scripts/test-hub-trip.mjs +1228 -1
- package/kits/hub-game/scripts/test-hud-clear.mjs +1000 -0
- package/kits/hub-game/scripts/test-idle.mjs +361 -1
- package/kits/hub-game/scripts/test-interest-cap.mjs +36 -0
- package/kits/hub-game/scripts/test-interest-cells.mjs +493 -0
- package/kits/hub-game/scripts/test-interest-client.mjs +118 -0
- package/kits/hub-game/scripts/test-keys.mjs +46 -1
- package/kits/hub-game/scripts/test-labels.mjs +596 -0
- package/kits/hub-game/scripts/test-manifest.mjs +282 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +480 -0
- package/kits/hub-game/scripts/test-menu.mjs +296 -0
- package/kits/hub-game/scripts/test-npcs.mjs +1718 -12
- package/kits/hub-game/scripts/test-object-entry.mjs +76 -0
- package/kits/hub-game/scripts/test-pack.mjs +7 -0
- package/kits/hub-game/scripts/test-party.mjs +22 -1
- package/kits/hub-game/scripts/test-picker.mjs +314 -0
- package/kits/hub-game/scripts/test-rehello.mjs +1039 -0
- package/kits/hub-game/scripts/test-relations-among.mjs +222 -0
- package/kits/hub-game/scripts/test-relations-refresh.mjs +188 -0
- package/kits/hub-game/scripts/test-say.mjs +59 -2
- package/kits/hub-game/scripts/test-shot.mjs +756 -0
- package/kits/hub-game/scripts/test-soundscape.mjs +5432 -0
- package/kits/hub-game/scripts/test-spin.mjs +314 -0
- package/kits/hub-game/scripts/test-standing.mjs +416 -0
- package/kits/hub-game/scripts/test-stuck.mjs +1903 -0
- package/kits/hub-game/scripts/test-tier-cells.mjs +706 -0
- package/kits/hub-game/scripts/test-tiers-render.mjs +339 -0
- package/kits/hub-game/scripts/test-tiers.mjs +666 -3
- package/kits/hub-game/scripts/test-toast-band.mjs +61 -0
- package/kits/hub-game/scripts/test-try-on.mjs +940 -0
- package/kits/hub-game/scripts/test-vis.mjs +343 -0
- package/kits/hub-game/scripts/test-visibility.mjs +134 -0
- package/kits/hub-game/scripts/test-yours-chrome.mjs +166 -0
- package/kits/hub-game/scripts/test-yours.mjs +372 -0
- package/kits/multiplayer-3d/CLAUDE.md +50 -0
- package/kits/multiplayer-3d/castle.json +5 -5
- package/kits/multiplayer-3d/code/client/avatars.js +7 -0
- package/kits/multiplayer-3d/code/client/gait.js +65 -0
- package/kits/multiplayer-3d/code/client/nameTags.js +59 -4
- package/kits/multiplayer-3d/code/options.js +5 -0
- package/kits/multiplayer-3d/code/server/ownership.js +10 -2
- package/kits/multiplayer-3d/code/server/sceneBodies.js +12 -0
- package/kits/multiplayer-3d/code/server/world.js +7 -0
- package/kits/multiplayer-3d/code/systems/multiplayer.js +74 -4
- package/kits/multiplayer-3d/package.json +2 -1
- package/kits/multiplayer-3d/scripts/fixtures/README.md +11 -0
- package/kits/multiplayer-3d/scripts/fixtures/ownership-legacy.json +2 -0
- package/kits/multiplayer-3d/scripts/ownership-harness.mjs +102 -0
- package/kits/multiplayer-3d/scripts/ownership-loader.mjs +46 -0
- package/kits/multiplayer-3d/scripts/ownership-worker.mjs +15 -0
- package/kits/multiplayer-3d/scripts/record-ownership-session.mjs +98 -0
- package/kits/multiplayer-3d/scripts/test-eligible-claims.mjs +167 -0
- package/kits/multiplayer-3d/scripts/test-own-name-tag.mjs +247 -0
- package/kits/physics-2d/CLAUDE.md +9 -0
- package/kits/physics-2d/castle.json +2 -2
- package/kits/physics-2d/engine/scene.js +288 -1
- package/kits/physics-2d/engine/skyKey.js +129 -0
- package/kits/physics-2d/engine/stillClock.js +106 -0
- package/kits/physics-2d/engine/updateBudget.js +21 -0
- package/kits/physics-2d/scripts/test-skip-unchanged.mjs +370 -1
- package/kits/physics-3d/CLAUDE.md +1391 -0
- package/kits/physics-3d/behaviors/Player.jsx +921 -3
- package/kits/physics-3d/castle.json +3 -3
- package/kits/physics-3d/docs/pxmodel-format.md +12 -0
- package/kits/physics-3d/engine3d/Scene3DPlayer.jsx +98 -10
- package/kits/physics-3d/engine3d/actornode.js +86 -0
- package/kits/physics-3d/engine3d/animationBudget.js +23 -0
- package/kits/physics-3d/engine3d/editorWorld.js +6 -0
- package/kits/physics-3d/engine3d/emptynodes.js +232 -0
- package/kits/physics-3d/engine3d/framecap.js +96 -0
- package/kits/physics-3d/engine3d/gait.js +118 -0
- package/kits/physics-3d/engine3d/kithooks.js +47 -0
- package/kits/physics-3d/engine3d/look.js +507 -48
- package/kits/physics-3d/engine3d/lookbake.js +208 -0
- package/kits/physics-3d/engine3d/materialpresets.js +2 -0
- package/kits/physics-3d/engine3d/motion.js +39 -10
- package/kits/physics-3d/engine3d/nearshadows.js +37 -19
- package/kits/physics-3d/engine3d/optimize.js +58 -5
- package/kits/physics-3d/engine3d/orbitinput.js +755 -0
- package/kits/physics-3d/engine3d/orbitlens.js +48 -0
- package/kits/physics-3d/engine3d/ownmodel.js +213 -0
- package/kits/physics-3d/engine3d/pxmodel.js +42 -11
- package/kits/physics-3d/engine3d/shadowfade.js +882 -0
- package/kits/physics-3d/engine3d/sky.js +547 -0
- package/kits/physics-3d/engine3d/skylife.js +306 -0
- package/kits/physics-3d/engine3d/unchanged.js +11 -0
- package/kits/physics-3d/engine3d/viewrange.js +52 -0
- package/kits/physics-3d/engine3d/world3d.js +870 -87
- package/kits/physics-3d/main.jsx +5 -0
- package/kits/physics-3d/package.json +1 -1
- package/kits/physics-3d/scripts/Player.before-orbit.mjs +310 -0
- package/kits/physics-3d/scripts/Scene3DPlayer.before-orbit.jsx +337 -0
- package/kits/physics-3d/scripts/look-baseline.mjs +155 -0
- package/kits/physics-3d/scripts/test-camera-follow.mjs +12 -2
- package/kits/physics-3d/scripts/test-camera-orbit.mjs +4588 -0
- package/kits/physics-3d/scripts/test-drop-empty-parts.mjs +787 -0
- package/kits/physics-3d/scripts/test-frame-cap-bob.mjs +435 -0
- package/kits/physics-3d/scripts/test-frame-cap.mjs +452 -0
- package/kits/physics-3d/scripts/test-gait.mjs +387 -0
- package/kits/physics-3d/scripts/test-look-bake.mjs +1056 -0
- package/kits/physics-3d/scripts/test-model-parse-cache.mjs +92 -0
- package/kits/physics-3d/scripts/test-near-shadows.mjs +3 -0
- package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +1920 -0
- package/kits/physics-3d/scripts/test-orbit-shift-lock.mjs +545 -0
- package/kits/physics-3d/scripts/test-orbit-shot.mjs +583 -0
- package/kits/physics-3d/scripts/test-orbit-view.mjs +230 -0
- package/kits/physics-3d/scripts/test-skip-empty-nodes.mjs +845 -0
- package/kits/physics-3d/scripts/test-sky.mjs +2470 -0
- package/kits/physics-3d/scripts/test-static-actors.mjs +13 -1
- package/kits/physics-3d/scripts/test-static-passes.mjs +1 -1
- package/kits/physics-3d/scripts/test-static-scenery.mjs +2171 -0
- package/kits/physics-3d/scripts/test-steady-hover.mjs +635 -0
- package/kits/physics-3d/scripts/test-view-range.mjs +260 -0
- package/kits/physics-3d/systems/physics3d.js +474 -12
- package/kits/real-time/castle.json +2 -2
- package/kits/real-time/code/server/gameHooks.js +7 -0
- package/kits/real-time/code/server/session.js +97 -19
- package/package.json +2 -2
- package/dist/shell/assets/index-Cf61cNfT.css +0 -1
package/dist/agent.js
CHANGED
|
@@ -31,7 +31,7 @@ import { nanoid } from 'nanoid';
|
|
|
31
31
|
import { WebSocketServer } from 'ws';
|
|
32
32
|
import { rawDataToString } from './rawData.js';
|
|
33
33
|
import { extractDirectives, meansAll, closedPrefLines, parsePrefLines, parseTaskFenceBody, resolveTargets, taskFenceRegex, } from './routerFences.js';
|
|
34
|
-
import { isPendingSteer, newTaskSteer, normalizeSteers, replayedUuid, steerBoardNote, steerMessageText, streamUserLine, } from './taskSteer.js';
|
|
34
|
+
import { followUpDirective, isPendingSteer, newTaskSteer, normalizeSteers, replayedUuid, steerBoardNote, steerMessageText, streamUserLine, } from './taskSteer.js';
|
|
35
35
|
import { carriesStopNotes, recentStops, stopNotes, } from './routerStops.js';
|
|
36
36
|
import { badTaskEndingsSince, platformInterruptionReason, ROUTER_STOPPED_RESULT, withTimeoutReport, } from './routerTaskEndings.js';
|
|
37
37
|
import { HANDOFF_MAX_CHARS, HANDOFF_MAX_LIST, noDeckFiles, quotableTaskText, routerPromptTask, summarizeTaskResult, } from './routerTaskReport.js';
|
|
@@ -42,7 +42,7 @@ import { readGitIncomingNote, removeGitIncoming } from './gitIncoming.js';
|
|
|
42
42
|
import { applyPlanOps, buildRouterPromptParts, buildTaskPrompt, parsePlanOps, userTurnInstruction, CLAUDE_TASK_SYSTEM_REMINDER, modelTaskAddendum, isMuseModel, } from './agent-prompts.js';
|
|
43
43
|
import { readCastleJson } from './castleJson.js';
|
|
44
44
|
import { checkOpenrouterKey, checkOpenrouterModel, primeOpenrouterCatalog, } from './openrouter-catalog.js';
|
|
45
|
-
import { classifyProviderError, failureCopy, failureLabel, routerTaskError, setReaderTimeZone, } from './agent-failures.js';
|
|
45
|
+
import { classifyProviderError, failureCopy, failureLabel, routerTaskError, routerTurnRetryable, routerTurnErrorText, setReaderTimeZone, } from './agent-failures.js';
|
|
46
46
|
import { castleCreditsExhausted, createBudgetRefreshRetry, createRefreshQueue, fetchAiCredits, fetchBudget, freeRolesFor, freeTierForRoles, meteringHeaders, modelIsFree, newAgentSessionId, spendableMicros, withCustomHeaders, } from './metering.js';
|
|
47
47
|
import { anthropicKeyHelperCommand, resolveAnthropicAuth, userKey, ANTHROPIC_CREDENTIAL_ENV, ANTHROPIC_PROXY_ENV, CASTLE_USER_KEYS_PATH, } from './byo-auth.js';
|
|
48
48
|
import { accountsSnapshot, loginProviderFor, watchCredentials, writeCredential, } from './byo-accounts.js';
|
|
@@ -505,7 +505,7 @@ export const RESUME_MAX_AGE_MS = 12 * 60 * 60_000;
|
|
|
505
505
|
// How long a killed run's stdout may take to drain before its timeout settles
|
|
506
506
|
// anyway (runAgentCli).
|
|
507
507
|
const TIMEOUT_DRAIN_MS = 5_000;
|
|
508
|
-
const MAX_TASK_ATTEMPTS = 3;
|
|
508
|
+
export const MAX_TASK_ATTEMPTS = 3;
|
|
509
509
|
// Cap on task agents running at once -- keeps us under e2b / provider rate
|
|
510
510
|
// limits. Over-cap tasks stay queued ('waiting') and start, earliest-created
|
|
511
511
|
// first, as running ones finish. Conservative default; override via env.
|
|
@@ -1474,6 +1474,8 @@ function runAgentCli(opts) {
|
|
|
1474
1474
|
settle({
|
|
1475
1475
|
ok,
|
|
1476
1476
|
finalText: state.finalText || state.accumulated,
|
|
1477
|
+
finalTextFromResult: state.finalTextFromResult,
|
|
1478
|
+
streamedChars: state.accumulated.length,
|
|
1477
1479
|
error: ok ? undefined : 'agent run timed out',
|
|
1478
1480
|
usage: state.usage,
|
|
1479
1481
|
stats: state.stats,
|
|
@@ -1587,6 +1589,7 @@ function runAgentCli(opts) {
|
|
|
1587
1589
|
ok,
|
|
1588
1590
|
finalText: state.finalText || state.accumulated,
|
|
1589
1591
|
finalTextFromResult: state.finalTextFromResult,
|
|
1592
|
+
streamedChars: state.accumulated.length,
|
|
1590
1593
|
usage: state.usage,
|
|
1591
1594
|
stats: state.stats,
|
|
1592
1595
|
sessionId: state.sessionId,
|
|
@@ -2349,6 +2352,7 @@ function claudeSessionIdOf(taskDir) {
|
|
|
2349
2352
|
return undefined;
|
|
2350
2353
|
}
|
|
2351
2354
|
const RESUME_TASK_PROMPT = 'The workspace restarted while you were working on this task and your run was cut off. Check what you already changed on disk, then finish the task and report exactly as the original instructions say.';
|
|
2355
|
+
const RESUME_AFTER_FLAP_PROMPT = 'Your last request to the model was refused by a temporary provider error and your run was cut off. Check what you already changed on disk, then finish the task and report exactly as the original instructions say.';
|
|
2352
2356
|
const FRESH_AFTER_INTERRUPTION_PREFIX = 'A previous run was cut off and part of the work may already be on disk, so check before redoing it.';
|
|
2353
2357
|
const WRAP_UP_PROMPT = 'You ran out of time and were stopped. Make no more changes. In a few sentences say what is done, what is left, and whether the deck is in a working state.';
|
|
2354
2358
|
function missingResumeSession(result) {
|
|
@@ -2606,6 +2610,8 @@ async function runTaskAgentIn(ctx, task) {
|
|
|
2606
2610
|
};
|
|
2607
2611
|
const resuming = task.interruptedFrom === 'running' && (task.resumeCount ?? 0) > 0;
|
|
2608
2612
|
let resumeSessionId = resuming ? claudeSessionIdOf(dir) : undefined;
|
|
2613
|
+
let resumePrompt = RESUME_TASK_PROMPT;
|
|
2614
|
+
let restartedAfterMissingSession = false;
|
|
2609
2615
|
const freshPrompt = resuming ? `${FRESH_AFTER_INTERRUPTION_PREFIX}\n\n${taskPrompt}` : taskPrompt;
|
|
2610
2616
|
for (let attempt = 1; attempt <= MAX_TASK_ATTEMPTS; attempt++) {
|
|
2611
2617
|
// A resumed session already holds the messages it was given; a fresh
|
|
@@ -2615,7 +2621,7 @@ async function runTaskAgentIn(ctx, task) {
|
|
|
2615
2621
|
promptUuid: randomUUID(),
|
|
2616
2622
|
resend: (steer) => (resumed ? isPendingSteer(steer) : steer.state !== 'undelivered'),
|
|
2617
2623
|
});
|
|
2618
|
-
result = await runOnce(resumed ?
|
|
2624
|
+
result = await runOnce(resumed ? resumePrompt : freshPrompt, {
|
|
2619
2625
|
timeoutMs: TASK_TIMEOUT_MS,
|
|
2620
2626
|
stdin,
|
|
2621
2627
|
resumeSessionId,
|
|
@@ -2625,13 +2631,26 @@ async function runTaskAgentIn(ctx, task) {
|
|
|
2625
2631
|
return result;
|
|
2626
2632
|
if (resumeSessionId && missingResumeSession(result)) {
|
|
2627
2633
|
resumeSessionId = undefined;
|
|
2628
|
-
// The
|
|
2629
|
-
//
|
|
2630
|
-
|
|
2634
|
+
// The first missing session gets a full fresh budget even after resume
|
|
2635
|
+
// crashes; resetting again would let flaps with missing sessions loop forever.
|
|
2636
|
+
if (!restartedAfterMissingSession) {
|
|
2637
|
+
restartedAfterMissingSession = true;
|
|
2638
|
+
attempt = 0;
|
|
2639
|
+
}
|
|
2631
2640
|
continue;
|
|
2632
2641
|
}
|
|
2633
2642
|
if (result.timedOut)
|
|
2634
2643
|
return finishTimedOut(result);
|
|
2644
|
+
if (result.failure?.upstreamFlap && attempt < MAX_TASK_ATTEMPTS) {
|
|
2645
|
+
resumeSessionId = result.sessionId ?? claudeSessionIdOf(dir);
|
|
2646
|
+
if (resumeSessionId) {
|
|
2647
|
+
resumePrompt = RESUME_AFTER_FLAP_PROMPT;
|
|
2648
|
+
ctx.onRetry(attempt + 1);
|
|
2649
|
+
if (await waitBeforeTaskRetry(attempt, ctx.stopRequested, task.id))
|
|
2650
|
+
return result;
|
|
2651
|
+
continue;
|
|
2652
|
+
}
|
|
2653
|
+
}
|
|
2635
2654
|
if (!result.crashed)
|
|
2636
2655
|
return resumeForLateSteers(ctx, task, result, runOnce);
|
|
2637
2656
|
// A crash normally means "the process died, try again" -- but a claude CLI
|
|
@@ -2675,8 +2694,8 @@ async function resumeForLateSteers(ctx, task, first, runOnce) {
|
|
|
2675
2694
|
}
|
|
2676
2695
|
// One resume of `sessionId` carrying the oldest pending message. Every message
|
|
2677
2696
|
// it did not finish a turn on is still pending when it ends, so a retry -- for
|
|
2678
|
-
// any end but a provider's error result or a config
|
|
2679
|
-
// all again.
|
|
2697
|
+
// any end but a provider's error result (except lookup flaps) or a config
|
|
2698
|
+
// failure -- carries them all again.
|
|
2680
2699
|
async function resumeOnce(ctx, task, sessionId, runOnce) {
|
|
2681
2700
|
let next = { ok: false, finalText: '', error: 'not run' };
|
|
2682
2701
|
for (let attempt = 1; attempt <= MAX_TASK_ATTEMPTS; attempt++) {
|
|
@@ -2691,7 +2710,7 @@ async function resumeOnce(ctx, task, sessionId, runOnce) {
|
|
|
2691
2710
|
});
|
|
2692
2711
|
next = await runOnce(steerMessageText(lead.text), { timeoutMs: TASK_TIMEOUT_MS, stdin, resumeSessionId: sessionId });
|
|
2693
2712
|
logAgentUsage(`task ${task.id} resume`, next.usage);
|
|
2694
|
-
const final = next.ok || next.resultError || next.timedOut || next.failure?.kind === 'config';
|
|
2713
|
+
const final = next.ok || (next.resultError && !next.failure?.upstreamFlap) || next.timedOut || next.failure?.kind === 'config';
|
|
2695
2714
|
if (final || ctx.stopRequested.has(task.id))
|
|
2696
2715
|
return next;
|
|
2697
2716
|
if (attempt < MAX_TASK_ATTEMPTS && (await waitBeforeTaskRetry(attempt, ctx.stopRequested, task.id)))
|
|
@@ -2722,6 +2741,27 @@ function heldForFromReply(messageId, text) {
|
|
|
2722
2741
|
chips,
|
|
2723
2742
|
};
|
|
2724
2743
|
}
|
|
2744
|
+
function releaseHeldTask(task, answer, touch, maybeStart) {
|
|
2745
|
+
if (task.status !== 'held')
|
|
2746
|
+
return false;
|
|
2747
|
+
task.answer = answer;
|
|
2748
|
+
task.prompt += `\n\nThe user answered: ${answer}`;
|
|
2749
|
+
task.status = 'waiting';
|
|
2750
|
+
touch(task);
|
|
2751
|
+
maybeStart(task);
|
|
2752
|
+
return true;
|
|
2753
|
+
}
|
|
2754
|
+
function answerHeldTasks(tasks, directives, touch, maybeStart) {
|
|
2755
|
+
const released = [];
|
|
2756
|
+
for (const { target, answer } of directives) {
|
|
2757
|
+
for (const id of resolveTargets(tasks, [target])) {
|
|
2758
|
+
const task = tasks.get(id);
|
|
2759
|
+
if (task && releaseHeldTask(task, answer, touch, maybeStart))
|
|
2760
|
+
released.push(id);
|
|
2761
|
+
}
|
|
2762
|
+
}
|
|
2763
|
+
return released;
|
|
2764
|
+
}
|
|
2725
2765
|
function releaseHeldTasks(tasks, answer, touch, maybeStart) {
|
|
2726
2766
|
const trimmed = answer.trim();
|
|
2727
2767
|
if (!trimmed)
|
|
@@ -2731,12 +2771,8 @@ function releaseHeldTasks(tasks, answer, touch, maybeStart) {
|
|
|
2731
2771
|
for (const task of sorted) {
|
|
2732
2772
|
if (task.status !== 'held' || !task.heldFor?.chips.includes(trimmed))
|
|
2733
2773
|
continue;
|
|
2734
|
-
task
|
|
2735
|
-
|
|
2736
|
-
task.status = 'waiting';
|
|
2737
|
-
touch(task);
|
|
2738
|
-
maybeStart(task);
|
|
2739
|
-
released.push(task.id);
|
|
2774
|
+
if (releaseHeldTask(task, trimmed, touch, maybeStart))
|
|
2775
|
+
released.push(task.id);
|
|
2740
2776
|
}
|
|
2741
2777
|
return released;
|
|
2742
2778
|
}
|
|
@@ -2928,30 +2964,59 @@ function startTask(ctx, task) {
|
|
|
2928
2964
|
ctx.rescheduleAll();
|
|
2929
2965
|
});
|
|
2930
2966
|
}
|
|
2931
|
-
function
|
|
2967
|
+
function activeSuccessor(tasks, task) {
|
|
2968
|
+
const visited = new Set();
|
|
2969
|
+
while (!visited.has(task.id)) {
|
|
2970
|
+
visited.add(task.id);
|
|
2971
|
+
const successor = [...(task.steers ?? [])].reverse()
|
|
2972
|
+
.map((steer) => steer.sentOnAs ? tasks.get(steer.sentOnAs) : undefined)
|
|
2973
|
+
.find((candidate) => candidate !== undefined);
|
|
2974
|
+
if (!successor || visited.has(successor.id))
|
|
2975
|
+
return undefined;
|
|
2976
|
+
if (!isTerminal(successor.status) && successor.status !== 'blocked')
|
|
2977
|
+
return successor;
|
|
2978
|
+
if (successor.status !== 'done')
|
|
2979
|
+
return undefined;
|
|
2980
|
+
task = successor;
|
|
2981
|
+
}
|
|
2982
|
+
return undefined;
|
|
2983
|
+
}
|
|
2984
|
+
function sendToTasks(store, directives, originMessageId, opts = {}) {
|
|
2932
2985
|
const unsent = [];
|
|
2933
2986
|
for (const directive of directives) {
|
|
2934
2987
|
const [id] = resolveTargets(store.tasks, [directive.target]);
|
|
2935
|
-
|
|
2988
|
+
let task = id ? store.tasks.get(id) : undefined;
|
|
2936
2989
|
if (!task) {
|
|
2937
2990
|
unsent.push(directive.target);
|
|
2938
2991
|
continue;
|
|
2939
2992
|
}
|
|
2940
|
-
|
|
2941
|
-
|
|
2993
|
+
if (task.status === 'done')
|
|
2994
|
+
task = activeSuccessor(store.tasks, task) ?? task;
|
|
2995
|
+
const steer = sendToTask(task, directive.text, originMessageId, store.steerChannels.get(task.id), store.spawn, opts);
|
|
2996
|
+
store.onFeed(task, steer.sentOnAs
|
|
2997
|
+
? '[the task had already finished; message sent on as a new task]'
|
|
2998
|
+
: '[message sent to this task]');
|
|
2942
2999
|
store.touch(task);
|
|
2943
3000
|
}
|
|
2944
3001
|
return unsent;
|
|
2945
3002
|
}
|
|
2946
3003
|
// A waiting or held task gets the message with its prompt when it starts, and a
|
|
2947
3004
|
// running one as soon as its stdin is up. A running task whose stdin already
|
|
2948
|
-
// closed holds it for a resume (resumeForLateSteers).
|
|
2949
|
-
//
|
|
2950
|
-
|
|
3005
|
+
// closed holds it for a resume (resumeForLateSteers). A done task gets a new
|
|
3006
|
+
// follow-up task; other terminal or blocked tasks cannot take a message, and
|
|
3007
|
+
// the board says so on the router's next turn.
|
|
3008
|
+
function sendToTask(task, text, originMessageId, channel, spawn, opts = {}) {
|
|
2951
3009
|
const steer = newTaskSteer(text, nowIso(), originMessageId);
|
|
2952
3010
|
task.steers = [...(task.steers ?? []), steer];
|
|
2953
3011
|
if (task.status === 'waiting' || task.status === 'held')
|
|
2954
3012
|
return steer;
|
|
3013
|
+
if (task.status === 'done') {
|
|
3014
|
+
steer.state = 'undelivered';
|
|
3015
|
+
steer.reason = 'the task had already finished';
|
|
3016
|
+
if (opts.followUp !== false)
|
|
3017
|
+
steer.sentOnAs = spawn(followUpDirective(task, text), originMessageId ?? '');
|
|
3018
|
+
return steer;
|
|
3019
|
+
}
|
|
2955
3020
|
if (task.status !== 'running' || !channel) {
|
|
2956
3021
|
steer.state = 'undelivered';
|
|
2957
3022
|
steer.reason =
|
|
@@ -3259,10 +3324,11 @@ export function createTaskStore(opts) {
|
|
|
3259
3324
|
touch,
|
|
3260
3325
|
spawnFromDirective,
|
|
3261
3326
|
releaseHeld,
|
|
3327
|
+
answerHeld: (directives) => answerHeldTasks(tasks, directives, touch, maybeStart),
|
|
3262
3328
|
acknowledge,
|
|
3263
3329
|
checkOff,
|
|
3264
3330
|
stop,
|
|
3265
|
-
send: (directives, originMessageId) => sendToTasks({ tasks, steerChannels, onFeed: opts.onFeed, touch }, directives, originMessageId),
|
|
3331
|
+
send: (directives, originMessageId, sendOpts) => sendToTasks({ tasks, steerChannels, onFeed: opts.onFeed, touch, spawn: spawnFromDirective }, directives, originMessageId, sendOpts),
|
|
3266
3332
|
pendingDurables,
|
|
3267
3333
|
clearPendingDurables,
|
|
3268
3334
|
shutdown,
|
|
@@ -3492,6 +3558,9 @@ function asClientTask(task, signPath) {
|
|
|
3492
3558
|
errorCopy: task.errorCopy,
|
|
3493
3559
|
errorDetail: task.errorDetail,
|
|
3494
3560
|
playtestFrames: (task.playtestFrames ?? []).map((rel) => clientUrl(`${AGENT_PLAYTEST_PREFIX}${task.id}/${path.basename(rel)}`, signPath)),
|
|
3561
|
+
steers: task.steers?.length
|
|
3562
|
+
? task.steers.map(({ id, text, state, at, reason, sentOnAs }) => ({ id, text, state, at, reason, sentOnAs }))
|
|
3563
|
+
: undefined,
|
|
3495
3564
|
};
|
|
3496
3565
|
}
|
|
3497
3566
|
function clientUrl(reqPath, signPath) {
|
|
@@ -3860,6 +3929,64 @@ function spawnCompletedTaskFences(ctx, message, midStream, raw) {
|
|
|
3860
3929
|
taskIds: message.taskIds,
|
|
3861
3930
|
});
|
|
3862
3931
|
}
|
|
3932
|
+
export function settleReplyDirectives(ctx, message, extracted, opts) {
|
|
3933
|
+
const { cleaned, directives, checkoffs, stops, answers, prefs, sends, plan } = extracted;
|
|
3934
|
+
const { ok, stale, spawnedTitles } = opts;
|
|
3935
|
+
if (ok && checkoffs.length > 0)
|
|
3936
|
+
ctx.taskStore.checkOff(checkoffs);
|
|
3937
|
+
if (ok && sends.length > 0) {
|
|
3938
|
+
const unsent = ctx.taskStore.send(sends, message.id, { followUp: !stale });
|
|
3939
|
+
if (unsent.length > 0)
|
|
3940
|
+
message.unsent = unsent;
|
|
3941
|
+
}
|
|
3942
|
+
if (ok && stops.length > 0) {
|
|
3943
|
+
const notes = stopNotes(ctx.taskStore.stop(stops));
|
|
3944
|
+
if (notes.length > 0)
|
|
3945
|
+
message.stopped = notes;
|
|
3946
|
+
}
|
|
3947
|
+
if (ok && !stale && answers.length > 0)
|
|
3948
|
+
ctx.taskStore.answerHeld(answers);
|
|
3949
|
+
if (ok) {
|
|
3950
|
+
const pref = parsePrefLines(prefs).playtest;
|
|
3951
|
+
if (pref && setPlaytestPref(ctx.deckDir, pref)) {
|
|
3952
|
+
ctx.broadcast(deckPrefsFrame(ctx.deckDir));
|
|
3953
|
+
}
|
|
3954
|
+
}
|
|
3955
|
+
// Settle-time only, unlike task fences: nothing is waiting on the file,
|
|
3956
|
+
// and a half-streamed op line is a line that says something else.
|
|
3957
|
+
if (ok && plan) {
|
|
3958
|
+
const written = applyPlanFence(ctx.deckDir, plan, planOpSources(ctx.taskStore, ctx.log.messages));
|
|
3959
|
+
if (written === 'written')
|
|
3960
|
+
message.planUpdated = true;
|
|
3961
|
+
// Any fence that became ops is the router's answer to the pending
|
|
3962
|
+
// nominations, including one whose ops all no-oped -- it looked and
|
|
3963
|
+
// passed. A fence that never parsed decided nothing, so they stay
|
|
3964
|
+
// pending for the turn that redoes it.
|
|
3965
|
+
if (written !== 'dropped')
|
|
3966
|
+
ctx.taskStore.clearPendingDurables();
|
|
3967
|
+
}
|
|
3968
|
+
// Drop directives from stale turns, any whose title matches a task
|
|
3969
|
+
// already in flight (two runs reacting to the same ask), and any
|
|
3970
|
+
// already spawned mid-stream by spawnCompletedTaskFences above --
|
|
3971
|
+
// otherwise the settle-time full-text parse would launch a second
|
|
3972
|
+
// copy of the same fence.
|
|
3973
|
+
const inFlight = new Set(ctx.taskStore
|
|
3974
|
+
.sorted()
|
|
3975
|
+
.filter((t) => t.status === 'held' || t.status === 'running' || t.status === 'waiting')
|
|
3976
|
+
.map((t) => t.title.toLowerCase()));
|
|
3977
|
+
// A failed reply may have died before its chips, and a held row with
|
|
3978
|
+
// none can never be released by a tap. Everything after that fence goes
|
|
3979
|
+
// with it: a later one may wait on it, and without the row it would
|
|
3980
|
+
// start at once.
|
|
3981
|
+
const firstHold = directives.findIndex((d) => d.hold);
|
|
3982
|
+
const settled = ok || firstHold < 0 ? directives : directives.slice(0, firstHold);
|
|
3983
|
+
const toSpawn = stale
|
|
3984
|
+
? []
|
|
3985
|
+
: settled.filter((d) => !inFlight.has(d.title.toLowerCase()) &&
|
|
3986
|
+
!spawnedTitles.has(d.title.toLowerCase()));
|
|
3987
|
+
const newlySpawnedIds = toSpawn.map((d) => ctx.taskStore.spawnFromDirective(d, message.id, cleaned));
|
|
3988
|
+
return newlySpawnedIds;
|
|
3989
|
+
}
|
|
3863
3990
|
// One router turn: stream a reply message, then spawn the directives it
|
|
3864
3991
|
// emitted (unless a newer user message superseded this turn).
|
|
3865
3992
|
function runRouterTurnIn(ctx, instruction) {
|
|
@@ -3940,61 +4067,16 @@ function runRouterTurnIn(ctx, instruction) {
|
|
|
3940
4067
|
settleInterruptedTurn(ctx, message);
|
|
3941
4068
|
return;
|
|
3942
4069
|
}
|
|
3943
|
-
const
|
|
4070
|
+
const extracted = extractDirectives(result.finalText, {
|
|
3944
4071
|
sends: TASK_STEER_ENABLED,
|
|
3945
4072
|
});
|
|
3946
|
-
|
|
3947
|
-
ctx.taskStore.checkOff(checkoffs);
|
|
3948
|
-
if (result.ok && sends.length > 0) {
|
|
3949
|
-
const unsent = ctx.taskStore.send(sends, message.id);
|
|
3950
|
-
if (unsent.length > 0)
|
|
3951
|
-
message.unsent = unsent;
|
|
3952
|
-
}
|
|
3953
|
-
if (result.ok && stops.length > 0) {
|
|
3954
|
-
const notes = stopNotes(ctx.taskStore.stop(stops));
|
|
3955
|
-
if (notes.length > 0)
|
|
3956
|
-
message.stopped = notes;
|
|
3957
|
-
}
|
|
3958
|
-
if (result.ok) {
|
|
3959
|
-
const pref = parsePrefLines(prefs).playtest;
|
|
3960
|
-
if (pref && setPlaytestPref(ctx.deckDir, pref)) {
|
|
3961
|
-
ctx.broadcast(deckPrefsFrame(ctx.deckDir));
|
|
3962
|
-
}
|
|
3963
|
-
}
|
|
3964
|
-
// Settle-time only, unlike task fences: nothing is waiting on the file,
|
|
3965
|
-
// and a half-streamed op line is a line that says something else.
|
|
3966
|
-
if (result.ok && plan) {
|
|
3967
|
-
const written = applyPlanFence(ctx.deckDir, plan, planOpSources(ctx.taskStore, ctx.log.messages));
|
|
3968
|
-
if (written === 'written')
|
|
3969
|
-
message.planUpdated = true;
|
|
3970
|
-
// Any fence that became ops is the router's answer to the pending
|
|
3971
|
-
// nominations, including one whose ops all no-oped -- it looked and
|
|
3972
|
-
// passed. A fence that never parsed decided nothing, so they stay
|
|
3973
|
-
// pending for the turn that redoes it.
|
|
3974
|
-
if (written !== 'dropped')
|
|
3975
|
-
ctx.taskStore.clearPendingDurables();
|
|
3976
|
-
}
|
|
3977
|
-
// Drop directives from stale turns, any whose title matches a task
|
|
3978
|
-
// already in flight (two runs reacting to the same ask), and any
|
|
3979
|
-
// already spawned mid-stream by spawnCompletedTaskFences above --
|
|
3980
|
-
// otherwise the settle-time full-text parse would launch a second
|
|
3981
|
-
// copy of the same fence.
|
|
4073
|
+
const { cleaned } = extracted;
|
|
3982
4074
|
const stale = epoch !== ctx.currentEpoch();
|
|
3983
|
-
const
|
|
3984
|
-
.
|
|
3985
|
-
|
|
3986
|
-
|
|
3987
|
-
|
|
3988
|
-
// none can never be released by a tap. Everything after that fence goes
|
|
3989
|
-
// with it: a later one may wait on it, and without the row it would
|
|
3990
|
-
// start at once.
|
|
3991
|
-
const firstHold = directives.findIndex((d) => d.hold);
|
|
3992
|
-
const settled = result.ok || firstHold < 0 ? directives : directives.slice(0, firstHold);
|
|
3993
|
-
const toSpawn = stale
|
|
3994
|
-
? []
|
|
3995
|
-
: settled.filter((d) => !inFlight.has(d.title.toLowerCase()) &&
|
|
3996
|
-
!midStream.spawnedTitles.has(d.title.toLowerCase()));
|
|
3997
|
-
const newlySpawnedIds = toSpawn.map((d) => ctx.taskStore.spawnFromDirective(d, message.id, cleaned));
|
|
4075
|
+
const newlySpawnedIds = settleReplyDirectives(ctx, message, extracted, {
|
|
4076
|
+
ok: result.ok,
|
|
4077
|
+
stale,
|
|
4078
|
+
spawnedTitles: midStream.spawnedTitles,
|
|
4079
|
+
});
|
|
3998
4080
|
const taskIds = [...(message.taskIds ?? []), ...newlySpawnedIds];
|
|
3999
4081
|
if (result.ok) {
|
|
4000
4082
|
message.text = cleaned;
|
|
@@ -4007,22 +4089,29 @@ function runRouterTurnIn(ctx, instruction) {
|
|
|
4007
4089
|
// would answer the same instruction twice (and could re-spawn
|
|
4008
4090
|
// near-duplicate tasks past the title dedup). Spawn failures are
|
|
4009
4091
|
// persistent (the CLI itself won't launch) and timeouts are too
|
|
4010
|
-
// expensive to repeat blind, so only "exit" crashes
|
|
4092
|
+
// expensive to repeat blind, so only "exit" crashes and upstream
|
|
4093
|
+
// model lookup flaps retry.
|
|
4011
4094
|
//
|
|
4012
4095
|
// "config" and "no-work" are deterministic -- the same slug, key, or
|
|
4013
4096
|
// model would fail again identically, so a retry is pure latency in
|
|
4014
4097
|
// front of the same message. "transient" is excluded too, but for a
|
|
4015
4098
|
// different reason: it has ALREADY been retried at the transport
|
|
4016
4099
|
// layer (3 backed-off connects), and a turn-level retry on top just
|
|
4017
|
-
// doubles the wait with the composer frozen.
|
|
4018
|
-
|
|
4019
|
-
|
|
4100
|
+
// doubles the wait with the composer frozen. Lookup flaps are the
|
|
4101
|
+
// exception because a 400 is never retried at the transport layer.
|
|
4102
|
+
const textIsProviderError = result.resultError === true && result.finalTextFromResult === true;
|
|
4103
|
+
retryable = routerTurnRetryable(failure, {
|
|
4104
|
+
text: cleaned,
|
|
4105
|
+
textIsProviderError,
|
|
4106
|
+
streamedChars: result.streamedChars ?? 0,
|
|
4107
|
+
spawnedTasks: taskIds.length > 0,
|
|
4108
|
+
});
|
|
4020
4109
|
const copy = failureCopy({
|
|
4021
4110
|
failure,
|
|
4022
4111
|
spawnedTasks: taskIds.length > 0,
|
|
4023
4112
|
willRetry: retryable && ctx.canAutoRetry(),
|
|
4024
4113
|
});
|
|
4025
|
-
message.text = cleaned
|
|
4114
|
+
message.text = routerTurnErrorText(cleaned, textIsProviderError, copy);
|
|
4026
4115
|
message.status = 'error';
|
|
4027
4116
|
message.errorDetail = failure.detail || result.error || 'unknown failure';
|
|
4028
4117
|
errorVerbose = failure.verbose;
|
|
@@ -46,6 +46,7 @@ export type PlatformHandler = (
|
|
|
46
46
|
|
|
47
47
|
export interface HostCapabilities {
|
|
48
48
|
graphqlFetch: GraphqlFetch;
|
|
49
|
+
localHubHearts?: Map<string, string[]>;
|
|
49
50
|
platformHandler?: PlatformHandler;
|
|
50
51
|
oracleStream?: OracleStream;
|
|
51
52
|
localPassGrant?: (passId: string) => boolean;
|
package/dist/castle-host/host.js
CHANGED
|
@@ -45,6 +45,8 @@ const COMMAND_NAMES = [
|
|
|
45
45
|
"hub.back",
|
|
46
46
|
"hub.doors",
|
|
47
47
|
"hub.friends",
|
|
48
|
+
"hub.hearts",
|
|
49
|
+
"hub.setHearts",
|
|
48
50
|
"hub.jump",
|
|
49
51
|
"hub.report",
|
|
50
52
|
"hub.chat",
|
|
@@ -233,6 +235,9 @@ function runCommand(ctx, command, params, caps, options) {
|
|
|
233
235
|
return timeGetServerTime(gql);
|
|
234
236
|
case "pass.has":
|
|
235
237
|
return passHas(ctx, params, caps);
|
|
238
|
+
case "hub.hearts":
|
|
239
|
+
case "hub.setHearts":
|
|
240
|
+
return hubHearts(ctx, command, params, caps);
|
|
236
241
|
case "avatar.get":
|
|
237
242
|
return avatarGet(gql);
|
|
238
243
|
case "avatar.set":
|
|
@@ -477,16 +482,54 @@ async function passHas(ctx, params, caps) {
|
|
|
477
482
|
const match = (data.passesForDeck ?? []).find((p) => p?.passId === passId);
|
|
478
483
|
return { hasPass: match?.isActive === true };
|
|
479
484
|
}
|
|
485
|
+
// Account-wide hub hearts use the same trusted GraphQL seam as avatars.
|
|
486
|
+
const HEARTS_QUERY = `query CastleHubHearts { cauldronHubHearts }`;
|
|
487
|
+
const SET_HEARTS_MUTATION = `mutation CastleSetHubHearts($deckId: ID!, $doorIds: [String!]!) {
|
|
488
|
+
setCauldronHubHearts(deckId: $deckId, doorIds: $doorIds)
|
|
489
|
+
}`;
|
|
490
|
+
async function hubHearts(ctx, command, params, caps) {
|
|
491
|
+
const unavailable = { status: "unavailable", hearts: [] };
|
|
492
|
+
const ids = params.doorIds;
|
|
493
|
+
const setting = command === "hub.setHearts";
|
|
494
|
+
if (setting && (!Array.isArray(ids) || ids.length > 8 ||
|
|
495
|
+
ids.some((id) => typeof id !== "string" || !id.length || id.length > 64) ||
|
|
496
|
+
new Set(ids).size !== ids.length)) {
|
|
497
|
+
throw new HostCommandError("INVALID_ARGUMENT", "doorIds must be at most eight distinct door ids.", command);
|
|
498
|
+
}
|
|
499
|
+
if (!ctx.userId || ctx.isAnonymous === true || ctx.username?.toLowerCase().startsWith("anonymous-user-"))
|
|
500
|
+
return unavailable;
|
|
501
|
+
if (caps.localHubHearts) {
|
|
502
|
+
if (setting)
|
|
503
|
+
caps.localHubHearts.set(ctx.userId, [...ids]);
|
|
504
|
+
return { status: "ok", hearts: [...(caps.localHubHearts.get(ctx.userId) ?? [])] };
|
|
505
|
+
}
|
|
506
|
+
if (setting && !ctx.deckId)
|
|
507
|
+
return unavailable;
|
|
508
|
+
try {
|
|
509
|
+
const data = await graphql(caps.graphqlFetch, setting ? SET_HEARTS_MUTATION : HEARTS_QUERY, setting ? { deckId: ctx.deckId, doorIds: ids } : {}, command);
|
|
510
|
+
const hearts = data[setting ? "setCauldronHubHearts" : "cauldronHubHearts"];
|
|
511
|
+
return Array.isArray(hearts) && hearts.length <= 8 && hearts.every((id) => typeof id === "string")
|
|
512
|
+
? { status: "ok", hearts: [...hearts] } : unavailable;
|
|
513
|
+
}
|
|
514
|
+
catch (error) {
|
|
515
|
+
if (error instanceof HostCommandError && ["LOGIN_REQUIRED", "CAULDRON_HUB_HEARTS_NOT_A_PLACE"].includes(error.code))
|
|
516
|
+
return unavailable;
|
|
517
|
+
throw error;
|
|
518
|
+
}
|
|
519
|
+
}
|
|
480
520
|
// The platform avatar: ghost keeps it per account (anonymous accounts too), so
|
|
481
521
|
// these are plain GraphQL with the player's own auth. A signed-out visitor has
|
|
482
522
|
// no account to keep one on, which is `unavailable`, not an error: the deck
|
|
483
523
|
// picks its own. Only a curated hub place may change it: the host names the
|
|
484
524
|
// place the player is in (ctx.deckId, never the deck's word) and ghost refuses
|
|
485
525
|
// any other deck, which is `unavailable` too.
|
|
486
|
-
|
|
526
|
+
// Ghost serves `color` (e6be5eef); a host's answer carries it, which is how
|
|
527
|
+
// the hub-game kit knows colour picks will stick.
|
|
528
|
+
const AVATAR_QUERY = `query CastleAvatar { cauldronHubAvatar { avatar chosen color } }`;
|
|
487
529
|
const SET_AVATAR_MUTATION = `mutation CastleSetAvatar($deckId: ID!, $avatar: Int!) {
|
|
488
530
|
setCauldronHubAvatar(deckId: $deckId, avatar: $avatar) { avatar chosen }
|
|
489
531
|
}`;
|
|
532
|
+
const SET_AVATAR_COLOR_MUTATION = `mutation CastleSetAvatarColor($deckId: ID!, $avatar: Int!, $color: Int) { setCauldronHubAvatar(deckId: $deckId, avatar: $avatar, color: $color) { avatar chosen color } }`;
|
|
490
533
|
const AVATAR_UNAVAILABLE_CODES = new Set([
|
|
491
534
|
"LOGIN_REQUIRED",
|
|
492
535
|
"CAULDRON_HUB_AVATAR_NOT_A_PLACE",
|
|
@@ -496,7 +539,7 @@ const AVATAR_MAX = 255;
|
|
|
496
539
|
function avatarResult(raw) {
|
|
497
540
|
const avatar = raw?.avatar;
|
|
498
541
|
return typeof avatar === "number" && Number.isInteger(avatar) && avatar >= 0
|
|
499
|
-
? { status: "ok", avatar, chosen: raw?.chosen === true }
|
|
542
|
+
? { status: "ok", avatar, chosen: raw?.chosen === true, ...(typeof raw?.color === "number" && Number.isInteger(raw.color) && raw.color >= 0 ? { color: raw.color } : {}) }
|
|
500
543
|
: unavailableAvatar();
|
|
501
544
|
}
|
|
502
545
|
function unavailableAvatar() {
|
|
@@ -519,10 +562,15 @@ async function avatarSet(ctx, params, gql) {
|
|
|
519
562
|
if (typeof avatar !== "number" || !Number.isInteger(avatar) || avatar < 0 || avatar > AVATAR_MAX) {
|
|
520
563
|
throw new HostCommandError("INVALID_ARGUMENT", "avatar must be a template index.", "avatar.set");
|
|
521
564
|
}
|
|
565
|
+
const hasColor = Object.hasOwn(params, "color");
|
|
566
|
+
const color = params.color;
|
|
567
|
+
if (hasColor && (typeof color !== "number" || !Number.isInteger(color) || color < 0 || color > AVATAR_MAX)) {
|
|
568
|
+
throw new HostCommandError("INVALID_ARGUMENT", "color must be an integer from 0 to 255.", "avatar.set");
|
|
569
|
+
}
|
|
522
570
|
if (!ctx.deckId)
|
|
523
571
|
return unavailableAvatar();
|
|
524
572
|
try {
|
|
525
|
-
const data = await graphql(gql, SET_AVATAR_MUTATION, { deckId: ctx.deckId, avatar }, "avatar.set");
|
|
573
|
+
const data = await graphql(gql, hasColor ? SET_AVATAR_COLOR_MUTATION : SET_AVATAR_MUTATION, hasColor ? { deckId: ctx.deckId, avatar, color } : { deckId: ctx.deckId, avatar }, "avatar.set");
|
|
526
574
|
return avatarResult(data.setCauldronHubAvatar);
|
|
527
575
|
}
|
|
528
576
|
catch (error) {
|
package/dist/castleJson.d.ts
CHANGED
|
@@ -105,8 +105,9 @@ export interface ResolvedServerConfig {
|
|
|
105
105
|
* What ghost keeps of castle.json `hub` (the hub contract's place manifest): each
|
|
106
106
|
* place's title and declared result shape. Ghost normalizes and validates it and
|
|
107
107
|
* pins it to the place's sessions, so a session's results are checked against
|
|
108
|
-
* what was published rather than what its code says.
|
|
109
|
-
* block is the kit's and stays
|
|
108
|
+
* what was published rather than what its code says. The deck-wide `unlocks`
|
|
109
|
+
* list goes too (below). Every other field of the block is the kit's and stays
|
|
110
|
+
* out of the bundle config.
|
|
110
111
|
*/
|
|
111
112
|
export interface ServerHubPlaceConfig {
|
|
112
113
|
title?: unknown;
|
|
@@ -114,6 +115,7 @@ export interface ServerHubPlaceConfig {
|
|
|
114
115
|
}
|
|
115
116
|
export interface ServerHubConfig extends ServerHubPlaceConfig {
|
|
116
117
|
places?: Record<string, ServerHubPlaceConfig>;
|
|
118
|
+
unlocks?: unknown;
|
|
117
119
|
}
|
|
118
120
|
export declare function resolveServerConfig(dir: string): ResolvedServerConfig | null;
|
|
119
121
|
export declare function deckStarterScene(dir: string): string;
|
package/dist/castleJson.js
CHANGED
package/dist/check.d.ts
CHANGED
package/dist/check.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import * as fs from 'fs';
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import { bundleProject } from './bundle.js';
|
|
4
|
+
import { isSandboxEnv } from './cloudGit.js';
|
|
4
5
|
import { readCastleJson, resolveServerConfig, validateExperiments } from './castleJson.js';
|
|
5
6
|
import { importChecksFailedMessage, runImportChecks } from './importCheckHook.js';
|
|
7
|
+
import { settleImportPins } from './importPinMismatch.js';
|
|
6
8
|
import { buildServerBundle } from './serverBundle.js';
|
|
7
9
|
import { buildContentPack } from './contentPack.js';
|
|
8
10
|
// `castle-web check` -- do this deck and its authoritative server still build?
|
|
@@ -17,12 +19,20 @@ import { buildContentPack } from './contentPack.js';
|
|
|
17
19
|
// rules a kit holds the decks built on it to, which no bundler can see. Those
|
|
18
20
|
// gate `save-deck` the same way (importCheckHook.ts). Then the content pack, when
|
|
19
21
|
// an import exports one (contentPack.ts).
|
|
20
|
-
export async function check(dir) {
|
|
22
|
+
export async function check(dir, opts = {}) {
|
|
21
23
|
const deckDir = path.resolve(dir);
|
|
22
24
|
if (!fs.existsSync(path.join(deckDir, 'index.html'))) {
|
|
23
25
|
console.error(`No index.html in ${deckDir} -- is this a deck?`);
|
|
24
26
|
process.exit(1);
|
|
25
27
|
}
|
|
28
|
+
// The same refusal `save-deck` makes: imports/ at other versions than pinned.
|
|
29
|
+
// In a cloud sandbox, as in a cloud save, it is a warning: an agent's check of
|
|
30
|
+
// a deck nobody touched there must not start failing over it.
|
|
31
|
+
if (!settleImportPins(deckDir, dir, 'check', opts.pinInstalledImports === true)) {
|
|
32
|
+
if (!isSandboxEnv(process.env))
|
|
33
|
+
process.exit(1);
|
|
34
|
+
console.error('Checking anyway (cloud sandbox).');
|
|
35
|
+
}
|
|
26
36
|
try {
|
|
27
37
|
await bundleProject(deckDir);
|
|
28
38
|
console.log('Bundle OK.');
|