elanous 0.2.6 → 0.2.8
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/.env.example +10 -7
- package/README.md +4 -0
- package/apps/pwa/out/404/index.html +1 -1
- package/apps/pwa/out/404.html +1 -1
- package/apps/pwa/out/_next/static/chunks/1105-c473ed46272fba79.js +1 -0
- package/apps/pwa/out/_next/static/chunks/1201-09613bce624467c0.js +1 -0
- package/apps/pwa/out/_next/static/chunks/1377-1efeffbbac0963ff.js +1 -0
- package/apps/pwa/out/_next/static/chunks/1470.98a6ab61ccb4131c.js +1 -0
- package/apps/pwa/out/_next/static/chunks/216-5acd01cbde4acda7.js +1 -0
- package/apps/pwa/out/_next/static/chunks/2330-c2f07246c8788af1.js +1 -0
- package/apps/pwa/out/_next/static/chunks/{3995-bee512a7063036ce.js → 2375-cb6debea56cce4fb.js} +1 -1
- package/apps/pwa/out/_next/static/chunks/2415.ed6428ff334c7ce2.js +1 -0
- package/apps/pwa/out/_next/static/chunks/2929-617f1e66a55be184.js +1 -0
- package/apps/pwa/out/_next/static/chunks/2977-e38442e86289f1d3.js +1 -0
- package/apps/pwa/out/_next/static/chunks/2982-2a2df543be3d2e5a.js +25 -0
- package/apps/pwa/out/_next/static/chunks/{8d0d9faf-97887ff99713b84e.js → 2ea96958-e8c7e112de50b067.js} +1 -1
- package/apps/pwa/out/_next/static/chunks/{5329.8b7e4bca684b6eec.js → 3403.4bc97b4066945a94.js} +2 -2
- package/apps/pwa/out/_next/static/chunks/3441-a1dd4acfeda14488.js +1 -0
- package/apps/pwa/out/_next/static/chunks/371-4ad6af55dad02ced.js +1 -0
- package/apps/pwa/out/_next/static/chunks/4114-3e63117452378807.js +1 -0
- package/apps/pwa/out/_next/static/chunks/{7633.0654fe6ea259c1ee.js → 4323.c5dfb6f503304775.js} +1 -1
- package/apps/pwa/out/_next/static/chunks/4836-3084c58c1725a40b.js +1 -0
- package/apps/pwa/out/_next/static/chunks/{2984-977cfa339fcd65a5.js → 5080-1613752891fcadb4.js} +3 -3
- package/apps/pwa/out/_next/static/chunks/5609-012bb3557211f07e.js +1 -0
- package/apps/pwa/out/_next/static/chunks/{763-7d0e1913b5074e98.js → 5791-bb82743fa6299562.js} +1 -1
- package/apps/pwa/out/_next/static/chunks/{4240-7153881b0b377306.js → 6062-73e68343a9814f6a.js} +1 -1
- package/apps/pwa/out/_next/static/chunks/6090-85a3f05f954e5697.js +1 -0
- package/apps/pwa/out/_next/static/chunks/6284-69db415193d5f8bd.js +1 -0
- package/apps/pwa/out/_next/static/chunks/6320-baac91d68843a9a6.js +1 -0
- package/apps/pwa/out/_next/static/chunks/6416-505ba707cacafbba.js +1 -0
- package/apps/pwa/out/_next/static/chunks/6725-68ab7cc0b1faf00d.js +1 -0
- package/apps/pwa/out/_next/static/chunks/6998-a654fe5c58271600.js +1 -0
- package/apps/pwa/out/_next/static/chunks/7032-f4ef698518fba61c.js +1 -0
- package/apps/pwa/out/_next/static/chunks/7647.2fcd30d894d5ee30.js +1 -0
- package/apps/pwa/out/_next/static/chunks/7673-2eda1507d38dadb8.js +1 -0
- package/apps/pwa/out/_next/static/chunks/7990-e12efba616f46e03.js +1 -0
- package/apps/pwa/out/_next/static/chunks/{91ff6dda-3b33d42d20657429.js → 8046cadf-211ca3c0e00f2b72.js} +1 -1
- package/apps/pwa/out/_next/static/chunks/8067-d976b441a104ab74.js +1 -0
- package/apps/pwa/out/_next/static/chunks/8142-744998d65d7bb17e.js +1 -0
- package/apps/pwa/out/_next/static/chunks/8519-5632377cce994f86.js +1 -0
- package/apps/pwa/out/_next/static/chunks/8619-4365e03a2862830f.js +1 -0
- package/apps/pwa/out/_next/static/chunks/8894-7317998f6cb97d8c.js +1 -0
- package/apps/pwa/out/_next/static/chunks/920-f7dceb78f1c585ef.js +1 -0
- package/apps/pwa/out/_next/static/chunks/9454-a3e0953307216c58.js +1 -0
- package/apps/pwa/out/_next/static/chunks/9651-3cd291a6fa1370d2.js +1 -0
- package/apps/pwa/out/_next/static/chunks/9740-8f5ff96c522b5f55.js +1 -0
- package/apps/pwa/out/_next/static/chunks/ae787e4c-f2998de7f1ba72a4.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/_not-found/page-859cea1570b6227a.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/approvals/page-9aa47b0bc6d570ff.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/autopilot/page-f4d2ecbbae6088d6.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/board/page-2053e49930c82748.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/botlab/page-d4b6df905f185055.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/bots/page-a70ba27c33003dd0.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/chat/page-186fc6952f027acc.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/consult/page-18166f885d831d3e.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/control/page-1c9d6cfe68b121c2.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/design-check/page-cbbe03c0da7b081a.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/editor/page-c108ff1fdb665c97.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/exec/page-147a328753d983e2.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/field/page-799395a9df7d95aa.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/healthz/route-859cea1570b6227a.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/intake/page-6a8158b71d1fe9d7.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/layout-9567560270857531.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/live/page-e7ed3d010153d818.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/market/page-c0c0d19d51342d3e.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/missions/[id]/page-2e002ad8faa43291.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/morning/page-b672e02e4bec8deb.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/not-found-1ba4a5d857276334.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/observatory/page-9db2226f38c542fb.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/page-70ee65f5f7a151dc.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/reflection/page-0bb8e43203efb23b.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/scheduler/page-092e1bcf27d751cc.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/sessions/page-eb52580c4b75b905.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/settings/devices/page-7464c1987dd76e6d.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/settings/page-e573437b0a1c728f.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/setup/done/page-294300625e49e4d3.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/setup/layout-859cea1570b6227a.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/setup/page-085847b088675978.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/share/page-9fe9d38c36999eb4.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/showroom/page-d8ab4d1489223459.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/tasks/page-6141f67f531d8b6a.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/term/page-295a02b1026b8255.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/trace/page-1eb9a0e1e054209d.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/vault/page-82efa177a30f3741.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/workflows/chat-ui/page-d0be51cec4f62606.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/workflows/page-2e367075ffdbc062.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/workspace/page-647ed2b66c1d49f1.js +1 -0
- package/apps/pwa/out/_next/static/chunks/app/worktrees/page-ba058c56e38f2792.js +1 -0
- package/apps/pwa/out/_next/static/chunks/framework-ea806bb57f2b8923.js +1 -0
- package/apps/pwa/out/_next/static/chunks/main-8d2302399c2c8f87.js +1 -0
- package/apps/pwa/out/_next/static/chunks/main-app-6870f30ea99f8346.js +1 -0
- package/apps/pwa/out/_next/static/chunks/pages/_app-b10928c60f0b8488.js +1 -0
- package/apps/pwa/out/_next/static/chunks/pages/_error-689039227d443fab.js +1 -0
- package/apps/pwa/out/_next/static/chunks/{webpack-37b8bf78a3c6eec5.js → webpack-e5bea36f183b25e6.js} +1 -1
- package/apps/pwa/out/_next/static/css/5ef72a618a8994f3.css +1 -0
- package/apps/pwa/out/_next/static/lywc8m_HDzH9MKSDQhyEj/_buildManifest.js +1 -0
- package/apps/pwa/out/approvals/index.html +1 -1
- package/apps/pwa/out/approvals/index.txt +22 -22
- package/apps/pwa/out/autopilot/index.html +1 -1
- package/apps/pwa/out/autopilot/index.txt +22 -22
- package/apps/pwa/out/board/index.html +1 -1
- package/apps/pwa/out/board/index.txt +22 -22
- package/apps/pwa/out/botlab/index.html +1 -1
- package/apps/pwa/out/botlab/index.txt +21 -21
- package/apps/pwa/out/bots/index.html +1 -1
- package/apps/pwa/out/bots/index.txt +21 -21
- package/apps/pwa/out/chat/index.html +1 -1
- package/apps/pwa/out/chat/index.txt +21 -21
- package/apps/pwa/out/consult/index.html +1 -0
- package/apps/pwa/out/consult/index.txt +32 -0
- package/apps/pwa/out/control/index.html +1 -1
- package/apps/pwa/out/control/index.txt +22 -22
- package/apps/pwa/out/design-check/index.html +1 -1
- package/apps/pwa/out/design-check/index.txt +22 -22
- package/apps/pwa/out/editor/index.html +1 -1
- package/apps/pwa/out/editor/index.txt +22 -22
- package/apps/pwa/out/exec/index.html +1 -0
- package/apps/pwa/out/exec/index.txt +32 -0
- package/apps/pwa/out/field/index.html +1 -0
- package/apps/pwa/out/field/index.txt +32 -0
- package/apps/pwa/out/healthz +1 -1
- package/apps/pwa/out/index.html +1 -1
- package/apps/pwa/out/index.txt +21 -21
- package/apps/pwa/out/intake/index.html +1 -1
- package/apps/pwa/out/intake/index.txt +22 -22
- package/apps/pwa/out/live/index.html +1 -1
- package/apps/pwa/out/live/index.txt +22 -22
- package/apps/pwa/out/market/index.html +1 -1
- package/apps/pwa/out/market/index.txt +21 -21
- package/apps/pwa/out/missions/placeholder/index.html +1 -1
- package/apps/pwa/out/missions/placeholder/index.txt +21 -21
- package/apps/pwa/out/morning/index.html +1 -1
- package/apps/pwa/out/morning/index.txt +22 -22
- package/apps/pwa/out/observatory/index.html +1 -1
- package/apps/pwa/out/observatory/index.txt +22 -22
- package/apps/pwa/out/reflection/index.html +1 -1
- package/apps/pwa/out/reflection/index.txt +22 -22
- package/apps/pwa/out/scheduler/index.html +1 -1
- package/apps/pwa/out/scheduler/index.txt +22 -22
- package/apps/pwa/out/sessions/index.html +1 -1
- package/apps/pwa/out/sessions/index.txt +21 -21
- package/apps/pwa/out/settings/devices/index.html +1 -1
- package/apps/pwa/out/settings/devices/index.txt +22 -22
- package/apps/pwa/out/settings/index.html +1 -1
- package/apps/pwa/out/settings/index.txt +22 -22
- package/apps/pwa/out/setup/done/index.html +1 -1
- package/apps/pwa/out/setup/done/index.txt +22 -22
- package/apps/pwa/out/setup/index.html +1 -1
- package/apps/pwa/out/setup/index.txt +22 -22
- package/apps/pwa/out/share/index.html +1 -1
- package/apps/pwa/out/share/index.txt +22 -22
- package/apps/pwa/out/showroom/index.html +1 -1
- package/apps/pwa/out/showroom/index.txt +21 -21
- package/apps/pwa/out/tasks/index.html +1 -1
- package/apps/pwa/out/tasks/index.txt +22 -22
- package/apps/pwa/out/term/index.html +1 -1
- package/apps/pwa/out/term/index.txt +22 -22
- package/apps/pwa/out/trace/index.html +1 -1
- package/apps/pwa/out/trace/index.txt +22 -22
- package/apps/pwa/out/vault/index.html +1 -1
- package/apps/pwa/out/vault/index.txt +22 -22
- package/apps/pwa/out/workflows/chat-ui/index.html +1 -1
- package/apps/pwa/out/workflows/chat-ui/index.txt +22 -22
- package/apps/pwa/out/workflows/index.html +1 -1
- package/apps/pwa/out/workflows/index.txt +22 -22
- package/apps/pwa/out/workspace/index.html +1 -1
- package/apps/pwa/out/workspace/index.txt +22 -22
- package/apps/pwa/out/worktrees/index.html +1 -1
- package/apps/pwa/out/worktrees/index.txt +22 -22
- package/bin/elanous.cjs +107 -0
- package/graphs/field/field-feed.yaml +24 -0
- package/graphs/field/recipes.yaml +12 -0
- package/graphs/landing/landing-heal.yaml +3 -1
- package/graphs/landing/recipes.yaml +3 -0
- package/graphs/release/recipes.yaml +10 -0
- package/graphs/release/release-loop.yaml +10 -3
- package/graphs/test-diet/recipes.yaml +9 -0
- package/graphs/test-diet/test-diet.yaml +22 -0
- package/package.json +6 -5
- package/persona-presets/_index.yaml +10 -0
- package/persona-presets/_schema.json +146 -0
- package/persona-presets/dana.yaml +26 -0
- package/persona-presets/haru.yaml +27 -0
- package/persona-presets/kai.yaml +27 -0
- package/persona-presets/leo.yaml +27 -0
- package/persona-presets/mira.yaml +30 -0
- package/persona-presets/nari.yaml +27 -0
- package/persona-presets/sora.yaml +27 -0
- package/persona-presets/yuna.yaml +27 -0
- package/plugins/card-followup/README.md +13 -4
- package/plugins/card-followup/graphs/card-followup.yaml +3 -1
- package/plugins/card-followup/graphs/recipes.yaml +5 -1
- package/plugins/card-followup/graphs/run-step.ts +122 -18
- package/plugins/card-followup/graphs/sales-strategy.ts +173 -0
- package/plugins/card-followup/plugin.json +1 -1
- package/plugins/doc-draft/README.md +13 -0
- package/plugins/doc-draft/examples/brief-sample.json +8 -0
- package/plugins/doc-draft/graphs/doc-draft.yaml +14 -0
- package/plugins/doc-draft/graphs/recipes.yaml +9 -0
- package/plugins/doc-draft/graphs/run-step.ts +113 -0
- package/plugins/doc-draft/plugin.json +24 -0
- package/plugins/geo-check/README.md +3 -1
- package/plugins/geo-check/graphs/run-step.ts +58 -13
- package/plugins/geo-check/plugin.json +1 -1
- package/plugins/job-coach/.codex-plugin/plugin.json +1 -1
- package/plugins/job-coach/README.md +1 -1
- package/plugins/job-coach/graphs/run-step.ts +2 -2
- package/plugins/job-coach/plugin.json +1 -1
- package/plugins/job-coach/plugin.ts +1 -1
- package/scripts/affinity/endcard.sh +3 -2
- package/scripts/affinity/reframe.sh +3 -1
- package/scripts/ci-public-export-leak-gate.ts +48 -0
- package/scripts/codex-quota-alert.ts +122 -258
- package/scripts/coord-tracks.json +4 -4
- package/scripts/field-feed/deliver-node.ts +57 -0
- package/scripts/field-feed/feed-node.ts +67 -0
- package/scripts/field-feed/lib.ts +164 -0
- package/scripts/field-feed/reel-node.ts +24 -0
- package/scripts/field-feed/start.ts +62 -0
- package/scripts/fixtures/vflow-sample.ndjson +6 -0
- package/scripts/install.sh +109 -21
- package/scripts/landing-heal/clean-checkout.ts +114 -0
- package/scripts/landing-heal/run-mission.ts +38 -3
- package/scripts/lib/pwa-scenarios/scenarios.ts +2 -1
- package/scripts/persona-presets/lint.ts +79 -0
- package/scripts/public-export.ts +8 -4
- package/scripts/release-loop/baseline-from-logs.ts +92 -0
- package/scripts/release-loop/checklist-gate-node.ts +2 -2
- package/scripts/release-loop/env-known-failures.ts +31 -0
- package/scripts/release-loop/gate-node.ts +108 -22
- package/scripts/release-loop/known-issues-node.ts +159 -0
- package/scripts/release-loop/npm-publish-node.ts +124 -0
- package/scripts/release-loop/ops-upgrade-node.ts +95 -0
- package/scripts/release-loop/publish-node.ts +23 -1
- package/scripts/release-loop/release-readiness.ts +58 -0
- package/scripts/release-loop/shard-plan.ts +17 -0
- package/scripts/release-loop/unattended-release.ts +93 -0
- package/scripts/storyboard/storyboard.ts +167 -0
- package/scripts/test-diet/lib.ts +88 -0
- package/scripts/test-diet/node.ts +102 -0
- package/scripts/ux/measure-first-text.ts +102 -0
- package/scripts/vflow-collect.ts +20 -7
- package/scripts/vflow-search.ts +73 -0
- package/scripts/video-free-line-test-walker.ts +36 -0
- package/scripts/video-pipeline.ts +2 -2
- package/skills/explainer-video/SKILL.md +12 -9
- package/skills/explainer-video/engine/build.mjs +1 -1
- package/skills/explainer-video/engine/reel.mjs +138 -31
- package/skills/explainer-video/engine/reel.sh +2 -1
- package/skills/explainer-video/examples/elanous-0.2.5/script.json +1 -1
- package/skills/grill-me/SKILL.md +1 -1
- package/skills/omni-digest/docs/diagrams/noncode-terminal-promotion-path-2026-08-13.mmd +1 -1
- package/src/a2a/server.ts +2 -0
- package/src/acp/auth-methods.ts +30 -0
- package/src/acp/elanous-aware-peers.ts +30 -0
- package/src/acp/server.ts +96 -20
- package/src/agent/monad-agent-turn.ts +25 -6
- package/src/agent/shared-app-tools.ts +5 -3
- package/src/agent-substrate/review-intent.ts +6 -2
- package/src/agent-substrate/shard-boundary-intent.ts +70 -0
- package/src/auth/github-app-token.ts +4 -1
- package/src/autopilot/track-agent-shadow.ts +151 -0
- package/src/autopilot/track-agent.ts +23 -3
- package/src/boot/acp-server-help.ts +16 -0
- package/src/boot/daemon-prompt-turn.ts +31 -10
- package/src/boot/daemon-tools/index.ts +7 -1
- package/src/budget/codex-credit-pace.ts +84 -0
- package/src/budget/codex-credit-plan.ts +154 -0
- package/src/budget/codex-reset-credit-state.ts +2 -0
- package/src/channel-import/detect.ts +191 -0
- package/src/channel-import/run.ts +111 -0
- package/src/chat/chat-cli.ts +4 -1
- package/src/chat/short-question.ts +40 -0
- package/src/cli/agent-cli.ts +24 -15
- package/src/cli/ask-bare.ts +42 -0
- package/src/cli/cli-user-error.ts +25 -0
- package/src/cli/codex-credit-plan-view.ts +25 -0
- package/src/cli/config-test-sync.ts +4 -0
- package/src/cli/decisions-cli.ts +13 -3
- package/src/cli/dependence-gauge.ts +237 -0
- package/src/cli/doctor-bundle.ts +128 -0
- package/src/cli/doctor-cli.ts +41 -1
- package/src/cli/doctor-local-llm.ts +95 -0
- package/src/cli/doctor-modes.ts +48 -0
- package/src/cli/import-cli.ts +60 -0
- package/src/cli/intake-cli.ts +12 -2
- package/src/cli/intake-source-cli.ts +58 -0
- package/src/cli/machine-cli.ts +23 -0
- package/src/cli/mcp-login.ts +13 -4
- package/src/cli/msg-cli.ts +137 -0
- package/src/cli/persona-cli.ts +116 -0
- package/src/cli/plugin-cli.ts +25 -0
- package/src/cli/pr-cli.ts +36 -0
- package/src/cli/provider-cli.ts +5 -0
- package/src/cli/release-cli.ts +50 -8
- package/src/cli/release-run-if-ready.ts +48 -0
- package/src/cli/setup-cli.ts +27 -6
- package/src/cli/setup-recommend.ts +8 -0
- package/src/cli/skills-cli.ts +173 -0
- package/src/cli/start-cli.ts +13 -4
- package/src/cli/usage-cli.ts +11 -1
- package/src/codex/setup.ts +37 -16
- package/src/dashboard/index.ts +18 -2
- package/src/dashboard/slash-runtime/dashboard-handlers.ts +2 -2
- package/src/dashboard/slash-runtime/help-from-registry.ts +4 -2
- package/src/decisions/decision-cards.ts +291 -0
- package/src/decisions/decision-ledger.ts +5 -2
- package/src/decisions/discord-decision-cards.ts +133 -0
- package/src/decisions/telegram-decision-cards.ts +100 -0
- package/src/directives/version-at.ts +77 -0
- package/src/discord.ts +73 -6
- package/src/domains/core-tools.ts +37 -14
- package/src/domains/outbound-alert.ts +94 -12
- package/src/domains/repeated-failure.ts +1 -1
- package/src/error-report/report.ts +200 -0
- package/src/exec-requests/planner.ts +146 -0
- package/src/exec-requests/runner.ts +378 -0
- package/src/exec-requests/store.ts +78 -0
- package/src/field/field-feed-auto.ts +48 -0
- package/src/field/field-media.ts +8 -3
- package/src/field/field-reel.ts +203 -0
- package/src/grok/credential.ts +7 -5
- package/src/harness/aside-run-status.ts +33 -0
- package/src/harness/browser-verify.ts +48 -17
- package/src/harness/harness-cli-command.ts +25 -3
- package/src/harness/image-load-state.ts +21 -0
- package/src/harness/process-garbage.ts +45 -0
- package/src/hooks/error-report.ts +210 -0
- package/src/hooks/receiver.ts +41 -1
- package/src/import/apply.ts +128 -0
- package/src/import/plan.ts +197 -0
- package/src/index.ts +168 -21
- package/src/input-core/text-entry.ts +13 -5
- package/src/instance/leader.ts +13 -1
- package/src/intake-plane/collect-github.ts +5 -3
- package/src/intake-plane/collect-telegram-saved.ts +15 -3
- package/src/intake-plane/discord-seat-work.ts +56 -0
- package/src/intake-plane/intake-sources.ts +202 -0
- package/src/intake-plane/items.ts +28 -12
- package/src/intake-plane/seat-answer.ts +96 -0
- package/src/intake-plane/seat-doc-route.ts +221 -0
- package/src/intake-plane/submit-intake-work.ts +9 -1
- package/src/intake-plane/telegram-seat-work.ts +72 -0
- package/src/llm/model-defaults.ts +24 -1
- package/src/llm.ts +5 -4
- package/src/machines/machine-ledger.ts +127 -0
- package/src/market/pack-internal-refs.ts +28 -0
- package/src/market/publish.ts +31 -4
- package/src/maturity/feature-maturity.ts +65 -0
- package/src/model-tier/turn-tier.ts +24 -0
- package/src/msg/msg-store.ts +149 -0
- package/src/native-tool-catalog.ts +2 -1
- package/src/nexus/api/chat-fast-path-config.ts +28 -0
- package/src/nexus/api/consult-requests.ts +128 -0
- package/src/nexus/api/discord-trigger-bot.ts +3 -0
- package/src/nexus/api/error-reports.ts +108 -0
- package/src/nexus/api/exec-requests.ts +51 -0
- package/src/nexus/api/field-uploads.ts +40 -3
- package/src/nexus/api/graph-approvals-feed.ts +140 -0
- package/src/nexus/api/graph-approvals.ts +71 -4
- package/src/nexus/api/http-server.ts +82 -8
- package/src/nexus/api/outbound-report.ts +7 -0
- package/src/nexus/api/running-runs-background.ts +68 -0
- package/src/nexus/api/running-runs-child.ts +6 -0
- package/src/nexus/api/seat-requests.ts +254 -0
- package/src/nexus/api/share-captures.ts +91 -0
- package/src/nexus/api/skill-problems.ts +56 -0
- package/src/nexus/api/terminals.ts +24 -8
- package/src/nexus/api/trace-run-scan.ts +37 -0
- package/src/nexus/api/trace.ts +19 -3
- package/src/nexus/index.ts +28 -1
- package/src/nexus/setup-status.ts +11 -7
- package/src/notify/llm-budget-alert.ts +16 -10
- package/src/oauth/browser-availability.ts +14 -0
- package/src/oauth/codex-account-rotation.ts +26 -4
- package/src/oauth/codex-account-store.ts +20 -2
- package/src/oauth/codex-browser-login.ts +173 -0
- package/src/oauth/codex-quota-policy.ts +16 -0
- package/src/oauth/codex.ts +4 -1
- package/src/oauth/fallback-chain.ts +5 -5
- package/src/oauth/store.ts +42 -5
- package/src/onboarding/continue-here.ts +34 -0
- package/src/onboarding/entry-hints.ts +8 -0
- package/src/onboarding/full-screen-io.ts +35 -3
- package/src/onboarding/help/skills.md +1 -1
- package/src/onboarding/non-interactive.ts +1 -0
- package/src/onboarding/subscription-hint.ts +27 -0
- package/src/onboarding/web-first.ts +90 -0
- package/src/onboarding.ts +287 -26
- package/src/persona/presets.ts +105 -0
- package/src/plugins/maker/node-install.ts +92 -0
- package/src/plugins/maker/node-maker.ts +139 -0
- package/src/plugins/maker/plugin-maker.ts +19 -7
- package/src/policy/llm-policy.ts +268 -0
- package/src/prompt-library/session-guidance.ts +7 -1
- package/src/prompt-library/universal-preamble.ts +2 -2
- package/src/relay/relay-cli.ts +20 -0
- package/src/relay/relay-server.ts +220 -0
- package/src/release-loop/checklist.ts +37 -13
- package/src/self-dev/decompose.ts +1 -0
- package/src/self-dev/dev-pipeline.ts +6 -3
- package/src/self-dev/orchestrate.ts +18 -11
- package/src/self-dev/run-record-mirror.ts +44 -0
- package/src/self-dev/run-store.ts +12 -3
- package/src/self-implement/harness-policy-gates.ts +4 -1
- package/src/self-implement/report-origin.ts +12 -1
- package/src/session/chat.ts +17 -5
- package/src/shell-env-bootstrap.ts +44 -7
- package/src/skills/connect-claude-plugin.ts +142 -0
- package/src/skills/connect.ts +70 -0
- package/src/skills/index.ts +29 -1
- package/src/skills/repair.ts +124 -0
- package/src/skills/runner.ts +11 -2
- package/src/skills/shared-agent-skill-roots.ts +25 -0
- package/src/skills/trigger-extract.ts +1 -1
- package/src/steward/failure-streak.ts +78 -0
- package/src/steward/steward-cards.ts +24 -0
- package/src/steward/triage-budget.ts +127 -0
- package/src/steward/triage-plan.ts +75 -0
- package/src/steward/triage.ts +244 -42
- package/src/task-cards/card-store.ts +1 -1
- package/src/task-orchestrator/surfaces/pod-command-job.ts +16 -8
- package/src/task-orchestrator/surfaces/pod-ledger-collect.ts +11 -5
- package/src/task-orchestrator/surfaces/pod-ledger-events.ts +68 -0
- package/src/task-orchestrator/surfaces/self-implement-pod.ts +78 -4
- package/src/telegram-commands.ts +13 -0
- package/src/telegram.ts +72 -2
- package/src/tool-runtime/elanous-skills-list-runtime.ts +3 -3
- package/src/tool-runtime/self-cognition-runtimes.ts +160 -2
- package/src/user-config.ts +189 -15
- package/src/version/packed-revision.json +1 -1
- package/src/video-pipeline/recipes/character.ts +42 -5
- package/src/video-pipeline/recipes/ffmpeg.ts +1 -1
- package/src/video-pipeline/recipes/free-line.ts +16 -3
- package/src/video-pipeline/recipes/remote.ts +7 -1
- package/src/video-pipeline/vflow-reference.ts +109 -0
- package/apps/pwa/out/_next/static/chunks/1169-696263ac7af8c4d4.js +0 -1
- package/apps/pwa/out/_next/static/chunks/1883.c91a2648af4842fd.js +0 -1
- package/apps/pwa/out/_next/static/chunks/1947-9d64872eeb9cfdec.js +0 -1
- package/apps/pwa/out/_next/static/chunks/2808-dc06482994b40f70.js +0 -1
- package/apps/pwa/out/_next/static/chunks/3165-95515ca5f299a120.js +0 -1
- package/apps/pwa/out/_next/static/chunks/3190-e9282753e7ebde85.js +0 -1
- package/apps/pwa/out/_next/static/chunks/4259-99614149577e77cb.js +0 -1
- package/apps/pwa/out/_next/static/chunks/4283-329eabeaf233e6cd.js +0 -1
- package/apps/pwa/out/_next/static/chunks/4328-cb5058b1acc2de5e.js +0 -25
- package/apps/pwa/out/_next/static/chunks/4801-ecee6ef62b349b18.js +0 -1
- package/apps/pwa/out/_next/static/chunks/5110-8058791dd25a2e14.js +0 -1
- package/apps/pwa/out/_next/static/chunks/5330-c41e9670f594c38f.js +0 -1
- package/apps/pwa/out/_next/static/chunks/5423-e95fd125d1794349.js +0 -1
- package/apps/pwa/out/_next/static/chunks/5478-b5eae07dc79ea619.js +0 -1
- package/apps/pwa/out/_next/static/chunks/5787-96ee6642b9a661e5.js +0 -1
- package/apps/pwa/out/_next/static/chunks/6448-79d72368589f98bc.js +0 -1
- package/apps/pwa/out/_next/static/chunks/6522-9866c002b5531836.js +0 -1
- package/apps/pwa/out/_next/static/chunks/6729-b4a558b7aa891e0c.js +0 -1
- package/apps/pwa/out/_next/static/chunks/6969-cb03f9410b7d2e03.js +0 -1
- package/apps/pwa/out/_next/static/chunks/7007-3b9861091bb8dd21.js +0 -1
- package/apps/pwa/out/_next/static/chunks/7930-8dc7e20fc6fc19ca.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8071-187edbc22a86741f.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8198-d4101ad70cb9a579.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8250.4a2c5553a07cdf47.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8293-123b91e7b0330dc0.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8296-d6d5d87dfa911d41.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8305-603963c33ee8eec3.js +0 -1
- package/apps/pwa/out/_next/static/chunks/8612-4a0066f20951b8fd.js +0 -1
- package/apps/pwa/out/_next/static/chunks/9181-cf4e1b61c4783f92.js +0 -1
- package/apps/pwa/out/_next/static/chunks/9262-26c2ecbd5a67e4a2.js +0 -1
- package/apps/pwa/out/_next/static/chunks/9328-45abdebce4fbecb7.js +0 -1
- package/apps/pwa/out/_next/static/chunks/9355-dbc67205adf8745f.js +0 -1
- package/apps/pwa/out/_next/static/chunks/9763.255b90dd69875689.js +0 -1
- package/apps/pwa/out/_next/static/chunks/9933-66d31ec25c0231af.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/_not-found/page-bd06fb55f4da0381.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/approvals/page-4e586142da455a25.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/autopilot/page-889ad5cddcf45b0d.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/board/page-47ba401d56572c27.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/botlab/page-0b54f9c83458e038.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/bots/page-4fcc296ef6c8ed90.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/chat/page-fe9fda494a87f4e5.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/control/page-f9642e25ce129590.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/design-check/page-e1063e8ba5f3e2e7.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/editor/page-9d0df30027d8aa9d.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/healthz/route-bd06fb55f4da0381.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/intake/page-d97adf2c9455b8d0.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/layout-236b80d202110362.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/live/page-21a30f35f1a276ad.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/market/page-b1a5be357c4fa25d.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/missions/[id]/page-1705a60303f7f573.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/morning/page-76b337c11ad0e237.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/not-found-7c0f85fbb56f64c6.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/observatory/page-65ca16b20617b44d.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/page-e7f9b8fc29411c1d.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/reflection/page-92ea6213d1aeec04.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/scheduler/page-a913a005aacb5476.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/sessions/page-2d78804a40dfdef6.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/settings/devices/page-08a99148e780ac00.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/settings/page-deb674e7ed36f815.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/setup/done/page-49f8de0534d192d7.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/setup/layout-bd06fb55f4da0381.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/setup/page-ba162a28d2176e18.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/share/page-1ff1a37b550ab41a.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/showroom/page-ccaa698f56c0fbdb.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/tasks/page-53b944082de1d7db.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/term/page-9b70adf1552789bf.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/trace/page-30d482aa63241fe8.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/vault/page-aecf786f54651d8a.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/workflows/chat-ui/page-6ab9b62c7b6e08f2.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/workflows/page-08949735455e0c9a.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/workspace/page-a1479005234a46c2.js +0 -1
- package/apps/pwa/out/_next/static/chunks/app/worktrees/page-c3890e90bd232732.js +0 -1
- package/apps/pwa/out/_next/static/chunks/beb5cf10-9adcc10b83930090.js +0 -1
- package/apps/pwa/out/_next/static/chunks/framework-d68d41c88e05c801.js +0 -1
- package/apps/pwa/out/_next/static/chunks/main-app-11c63971b7a9593b.js +0 -1
- package/apps/pwa/out/_next/static/chunks/main-d09452353bd0d9cc.js +0 -1
- package/apps/pwa/out/_next/static/chunks/pages/_app-184d727cebeca767.js +0 -1
- package/apps/pwa/out/_next/static/chunks/pages/_error-21bbbbac99b720b1.js +0 -1
- package/apps/pwa/out/_next/static/css/eaa74e8bb2f62269.css +0 -1
- package/apps/pwa/out/_next/static/qMI0jnlZaBjjm4aIDYNGM/_buildManifest.js +0 -1
- /package/apps/pwa/out/_next/static/{qMI0jnlZaBjjm4aIDYNGM → lywc8m_HDzH9MKSDQhyEj}/_ssgManifest.js +0 -0
|
@@ -7,6 +7,7 @@ import { debug } from '../../src/debug/log.js';
|
|
|
7
7
|
import { emitDecision } from '../../src/live/detail-switch.js';
|
|
8
8
|
import { parse } from '../../src/agent-substrate/pr-comment-meta.js';
|
|
9
9
|
import { classifyReviewRounds, matchMustFix, type MustFixVerdict } from './must-fix-match.js';
|
|
10
|
+
import { verifyCleanCheckout, type CheckoutResult } from './clean-checkout.js';
|
|
10
11
|
|
|
11
12
|
interface PullRequest {
|
|
12
13
|
number: number;
|
|
@@ -17,7 +18,7 @@ interface PullRequest {
|
|
|
17
18
|
files: Array<{ path: string }>;
|
|
18
19
|
}
|
|
19
20
|
interface Match { pr: number; text: string; verdict: MustFixVerdict | 'rereviewed' | 'open'; run?: string; round?: number; resolvedIn?: number[] }
|
|
20
|
-
interface GraphContext { runId?: string; input?: { windowMinutes?: number; mustFixByPr?: Record<string, string[]
|
|
21
|
+
interface GraphContext { runId?: string; input?: { windowMinutes?: number; mustFixByPr?: Record<string, string[]>; postVerified?: boolean }; outputs?: Record<string, unknown>; decision?: typeof emitDecision }
|
|
21
22
|
export type RunCommand = (args: string[]) => string;
|
|
22
23
|
// 상주 루프(30분마다)는 사람 계정 한도를 쓰지 않는다 — 부른 쪽이 GH_TOKEN 을 주지 않았으면 GitHub App 설치 토큰으로(09-29 한도 소진).
|
|
23
24
|
// 발급 함수마다 한 번(프로세스 전역 한 칸이면 앞선 호출의 진짜 토큰이 주입한 가짜를 이긴다 — 09-29 시험 실패 출력에 토큰이 찍혔다).
|
|
@@ -93,7 +94,7 @@ export function resolvedInPrs(body: string | undefined): number[] {
|
|
|
93
94
|
return match ? [...match[1]!.matchAll(/#(\d+)/g)].map((m) => Number(m[1])) : [];
|
|
94
95
|
}
|
|
95
96
|
|
|
96
|
-
export function runMission(mission: string, ctx: GraphContext, run: RunCommand = gh, now = new Date()): Record<string, unknown> {
|
|
97
|
+
export function runMission(mission: string, ctx: GraphContext, run: RunCommand = gh, now = new Date(), verify = verifyCleanCheckout): Record<string, unknown> {
|
|
97
98
|
switch (mission) {
|
|
98
99
|
case 'collect': {
|
|
99
100
|
const minutes = ctx.input?.windowMinutes ?? 60;
|
|
@@ -156,6 +157,37 @@ export function runMission(mission: string, ctx: GraphContext, run: RunCommand =
|
|
|
156
157
|
}).map((pr) => pr.number);
|
|
157
158
|
return { outcome: 'ok', verifyNeeded, verified };
|
|
158
159
|
}
|
|
160
|
+
case 'clean-checkout': {
|
|
161
|
+
const needed = output(ctx, 'verify-needed').verifyNeeded as number[];
|
|
162
|
+
const candidates = pullRequests(ctx).filter((pr) => needed.includes(pr.number))
|
|
163
|
+
.sort((a, b) => Date.parse(a.mergedAt ?? '') - Date.parse(b.mergedAt ?? '') || a.number - b.number).slice(0, 2);
|
|
164
|
+
const results: CheckoutResult[] = [];
|
|
165
|
+
for (const pr of candidates) {
|
|
166
|
+
let mergeSha = '';
|
|
167
|
+
try {
|
|
168
|
+
const details = JSON.parse(run(['pr', 'view', String(pr.number), '--json', 'mergeCommit'])) as { mergeCommit?: { oid?: string } };
|
|
169
|
+
mergeSha = details.mergeCommit?.oid ?? '';
|
|
170
|
+
if (!/^[a-f0-9]{40,64}$/i.test(mergeSha)) throw new Error('mergeCommit.oid unavailable or invalid');
|
|
171
|
+
} catch (error) {
|
|
172
|
+
results.push({ pr: pr.number, mergeSha: '', ok: false, steps: [{ name: 'merge commit', ok: false, seconds: 0, tail: String(error).split('\n').slice(-20).join('\n') }] });
|
|
173
|
+
debug.log('landing-heal', 'clean-checkout', { pr: pr.number, ok: false, seconds: 0 });
|
|
174
|
+
continue;
|
|
175
|
+
}
|
|
176
|
+
let result: CheckoutResult;
|
|
177
|
+
try {
|
|
178
|
+
result = verify({ pr: pr.number, mergeSha, files: pr.files.map((file) => file.path) });
|
|
179
|
+
} catch (error) {
|
|
180
|
+
result = { pr: pr.number, mergeSha, ok: false, steps: [{ name: 'clean checkout', ok: false, seconds: 0, tail: String(error).split('\n').slice(-20).join('\n') }] };
|
|
181
|
+
}
|
|
182
|
+
results.push(result);
|
|
183
|
+
debug.log('landing-heal', 'clean-checkout', { pr: pr.number, ok: result.ok, seconds: result.steps.reduce((sum, step) => sum + step.seconds, 0) });
|
|
184
|
+
if (result.ok && ctx.input?.postVerified === true) {
|
|
185
|
+
const summary = result.steps.filter((step) => step.name !== 'worktree remove').map((step) => step.name).join(' · ');
|
|
186
|
+
run(['pr', 'comment', String(pr.number), '--body', `landing-verified: ${mergeSha.slice(0, 8)} · clean checkout · ${summary}`]);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return { outcome: 'ok', results };
|
|
190
|
+
}
|
|
159
191
|
case 'report': {
|
|
160
192
|
const collected = pullRequests(ctx);
|
|
161
193
|
const prs = collected.length;
|
|
@@ -165,6 +197,9 @@ export function runMission(mission: string, ctx: GraphContext, run: RunCommand =
|
|
|
165
197
|
const mustFixRereviewed = matches.filter((item) => item.verdict === 'rereviewed').length;
|
|
166
198
|
const mustFixUnresolved = mustFixOpen + mustFixUnknown;
|
|
167
199
|
const verifyNeeded = output(ctx, 'verify-needed').verifyNeeded as number[];
|
|
200
|
+
const checkoutResults = ctx.outputs?.['clean-checkout'] ? output(ctx, 'clean-checkout').results as CheckoutResult[] : undefined;
|
|
201
|
+
const checkoutPassed = checkoutResults?.filter((item) => item.ok).length ?? 0;
|
|
202
|
+
const checkoutFailed = checkoutResults?.filter((item) => !item.ok).map((item) => item.pr) ?? [];
|
|
168
203
|
const mergedPrs = new Set(collected.filter((pr) => pr.state === 'MERGED').map((pr) => pr.number));
|
|
169
204
|
const landedOpen = matches.filter((item) => item.verdict === 'open' && mergedPrs.has(item.pr));
|
|
170
205
|
const unresolved = matches.filter((item) => item.verdict === 'unresolved').length;
|
|
@@ -174,7 +209,7 @@ export function runMission(mission: string, ctx: GraphContext, run: RunCommand =
|
|
|
174
209
|
(ctx.decision ?? emitDecision)({
|
|
175
210
|
kind: 'VERIFY',
|
|
176
211
|
what: `착지·치유 관측: PR ${prs}건${open ? ` — 열린 must-fix ${open}건(PR ${openPrs.map((pr) => `#${pr}`).join(', ')})` : ''}`,
|
|
177
|
-
reason: `열린 채 착지 ${open}건 · 미해결 ${unresolved}건 · 미상 ${mustFixUnknown}건 · 다시 봄 ${mustFixRereviewed}건 · 착지 뒤 검증 필요 ${verifyNeeded.length}
|
|
212
|
+
reason: `열린 채 착지 ${open}건 · 미해결 ${unresolved}건 · 미상 ${mustFixUnknown}건 · 다시 봄 ${mustFixRereviewed}건 · 착지 뒤 검증 필요 ${verifyNeeded.length}건${checkoutResults ? ` · 검증 성공 ${checkoutPassed} · 실패 ${checkoutFailed.length}(PR ${checkoutFailed.map((pr) => `#${pr}`).join(', ') || '없음'})` : ''}`,
|
|
178
213
|
purpose: '착지 후속 작업 관측', target: 'landing-heal', ...(ctx.runId ? { runId: ctx.runId } : {}),
|
|
179
214
|
});
|
|
180
215
|
return { outcome: 'ok', prs, mustFixUnresolved, mustFixOpen, mustFixUnknown, mustFixRereviewed, verifyNeeded };
|
|
@@ -43,7 +43,8 @@ const tab = 'button[aria-label^="switch to "]';
|
|
|
43
43
|
const terminal = '.xterm';
|
|
44
44
|
const connected = '[aria-live="polite"]';
|
|
45
45
|
// ChatInput 의 입력창(`apps/pwa/src/components/chat/ChatInput.tsx` placeholder) — testid 가 없어 placeholder 로 고른다.
|
|
46
|
-
|
|
46
|
+
// Placeholder text is user copy (10-01 #22558 localized it and silently broke C1·C2a·C2b) — match both locales.
|
|
47
|
+
const chatInput = 'textarea[placeholder^="message"], textarea[placeholder^="메시지"]';
|
|
47
48
|
const intakeField = '[data-testid="intake-front-door-field"]';
|
|
48
49
|
const terminalIdentity = `(() => { const sessionId = localStorage.getItem('elanous.daemon.sessionId'); const terminalId = Array.from(document.querySelectorAll('button[aria-label^="switch to "]')).find(node => node.title?.includes('지금 보는 터미널'))?.getAttribute('aria-label')?.slice('switch to '.length); return sessionId && terminalId ? { sessionId, terminalId } : null; })()`;
|
|
49
50
|
const identity = (value: unknown): { sessionId: string; terminalId: string } | null => {
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
#!/usr/bin/env bun
|
|
2
|
+
// 페르소나 프리셋 문면 검사(PS1 · 2026-10-02) — persona-presets/<id>.yaml
|
|
3
|
+
// bun scripts/persona-presets/lint.ts 오류가 있으면 rc 1 · 경고만이면 rc 0
|
|
4
|
+
// 지키는 것: 도구는 «지금 설치할 수 있는 것»만(공개 묶음 표 · 저장소 플러그인 · core) · 용어(«캐릭터» 금지) ·
|
|
5
|
+
// 자리(OP·MK·TC·UX)와 이름이 겹치지 않음 · 직함은 선택 속성 · 과장 금지어.
|
|
6
|
+
import { existsSync, readdirSync, readFileSync } from 'node:fs';
|
|
7
|
+
import { join, resolve } from 'node:path';
|
|
8
|
+
import { parse } from 'yaml';
|
|
9
|
+
|
|
10
|
+
const ROOT = resolve(import.meta.dir, '../..');
|
|
11
|
+
const DIR = join(ROOT, 'persona-presets');
|
|
12
|
+
|
|
13
|
+
export type Preset = {
|
|
14
|
+
personaId: string; displayName: string; names: string[]; role: string; title?: string | null; oneLine: string;
|
|
15
|
+
voice: { rule: string; examples: string[] }; tasks: Array<{ when: string; what: string }>;
|
|
16
|
+
tools: Array<{ name: string; from: string; optional?: boolean }>; firstQuestions: string[]; askBefore?: string[]; doesNot: string[]; forWhom: string;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
const CORE = new Set(['harness']);
|
|
20
|
+
const TITLES = new Set(['COO', 'CMO', 'CTO', 'CXO']);
|
|
21
|
+
const SEATS = /^(OP|MK|TC|UX)$/i;
|
|
22
|
+
const BANNED = ['캐릭터', '완전 자율', '무엇이든', '유일', '알아서 다'];
|
|
23
|
+
|
|
24
|
+
/** Official packs and the skills each one lists, read from the public plugin table (the same page users read). */
|
|
25
|
+
export function officialPacks(root = ROOT): Map<string, string> {
|
|
26
|
+
const table = readFileSync(join(root, 'release/public/docs/plugins.md'), 'utf8');
|
|
27
|
+
const packs = new Map<string, string>();
|
|
28
|
+
for (const row of table.split('\n')) {
|
|
29
|
+
const m = row.match(/^\| `([a-z0-9-]+)` \| (.*) \| (.*) \|$/);
|
|
30
|
+
if (m && !/not published/i.test(m[3]!)) packs.set(m[1]!, m[2]!);
|
|
31
|
+
}
|
|
32
|
+
return packs;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function lintPreset(p: Preset, file: string, packs: Map<string, string>, root = ROOT): { errors: string[]; warnings: string[] } {
|
|
36
|
+
const errors: string[] = []; const warnings: string[] = [];
|
|
37
|
+
const need = (ok: unknown, msg: string) => { if (!ok) errors.push(msg); };
|
|
38
|
+
need(/^[a-z][a-z0-9-]{1,30}$/.test(p.personaId ?? '') && file.endsWith(`/${p.personaId}.yaml`), 'personaId = 파일 이름(소문자)');
|
|
39
|
+
need(p.displayName && p.role && p.oneLine && p.forWhom, 'displayName · role · oneLine · forWhom 필요');
|
|
40
|
+
need(Array.isArray(p.names) && p.names.length >= 2, 'names 후보 둘 이상');
|
|
41
|
+
need(p.voice?.rule && p.voice.examples?.length === 2, 'voice = rule ⊕ 예시 두 줄');
|
|
42
|
+
need(p.tasks?.length === 3 && p.tasks.every((t) => t.when && t.what), 'tasks = 할 일 셋(when · what)');
|
|
43
|
+
need(p.firstQuestions?.length >= 2 && p.firstQuestions.length <= 3, 'firstQuestions = 처음 묻는 칸 둘~셋');
|
|
44
|
+
need(p.doesNot?.length >= 2, 'doesNot = 하지 않는 것 둘 이상');
|
|
45
|
+
if (p.title != null && !TITLES.has(p.title)) errors.push(`title 은 없음 또는 ${[...TITLES].join('·')}`);
|
|
46
|
+
for (const name of p.names ?? []) if (SEATS.test(name)) errors.push(`이름 «${name}» 이 자리(OP·MK·TC·UX)와 겹친다`);
|
|
47
|
+
const text = JSON.stringify(p);
|
|
48
|
+
for (const word of BANNED) if (text.includes(word)) errors.push(`금지어 «${word}»`);
|
|
49
|
+
for (const tool of p.tools ?? []) {
|
|
50
|
+
if (tool.from === 'core') { if (!CORE.has(tool.name)) errors.push(`core 도구 «${tool.name}» 는 없다`); continue; }
|
|
51
|
+
const row = packs.get(tool.from);
|
|
52
|
+
if (row !== undefined) {
|
|
53
|
+
if (tool.from !== tool.name && !row.includes(`\`${tool.name}\``)) errors.push(`«${tool.name}» 이 묶음 «${tool.from}» 의 목록에 없다`);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
// 공식 묶음에 없는 도구 = 저장소 플러그인일 때만 · 반드시 optional(공개 판 사용자는 따로 설치해야 쓴다)
|
|
57
|
+
if (tool.from !== tool.name || !existsSync(join(root, 'plugins', tool.name, 'plugin.json'))) errors.push(`«${tool.name}» 은 공식 묶음에도 plugins/${tool.name}/plugin.json 에도 없다`);
|
|
58
|
+
else if (tool.optional !== true) errors.push(`«${tool.name}» 은 공식 묶음에 없다 — optional: true 로 둔다`);
|
|
59
|
+
else warnings.push(`«${tool.name}» 은 선택 도구(공식 묶음 게재 전)`);
|
|
60
|
+
}
|
|
61
|
+
return { errors, warnings };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
if (import.meta.main) {
|
|
65
|
+
const packs = officialPacks();
|
|
66
|
+
const index = parse(readFileSync(join(DIR, '_index.yaml'), 'utf8')) as { presets: string[] };
|
|
67
|
+
const files = readdirSync(DIR).filter((f) => f.endsWith('.yaml') && !f.startsWith('_'));
|
|
68
|
+
let bad = 0; const names = new Map<string, string>();
|
|
69
|
+
for (const f of files) {
|
|
70
|
+
const p = parse(readFileSync(join(DIR, f), 'utf8')) as Preset;
|
|
71
|
+
const { errors, warnings } = lintPreset(p, `persona-presets/${f}`, packs);
|
|
72
|
+
if (!index.presets.includes(p.personaId)) errors.push('_index.yaml presets 에 없다');
|
|
73
|
+
for (const n of p.names ?? []) { if (names.has(n)) errors.push(`이름 «${n}» 이 ${names.get(n)} 와 겹친다`); names.set(n, p.personaId); }
|
|
74
|
+
for (const e of errors) console.log(`✗ ${f}: ${e}`);
|
|
75
|
+
for (const w of warnings) console.log(`⚠ ${f}: ${w}`);
|
|
76
|
+
if (errors.length) bad++; else console.log(`✓ ${f} · ${p.displayName} · 도구 ${p.tools.length}`);
|
|
77
|
+
}
|
|
78
|
+
process.exit(bad ? 1 : 0);
|
|
79
|
+
}
|
package/scripts/public-export.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
* 표지 = LEAK_MARKERS(줄 단위 흔적 · 문서 링크는 private 에 «실재»하는 이름만) — rc 는 이것만 센다.
|
|
12
12
|
* 참고 = `runtime-path-outside-export`(공개 코드가 공개본에 없는 경로를 쥔다) — rc 에 안 센다 · 판정은 public-export-test-run 의 exportOnly=0.
|
|
13
13
|
* bun scripts/public-export.ts --out <dir> # 트리 복사 ⊕ replace 적용 ⊕ 유출 검사(있으면 rc=1 · 복사는 한다)
|
|
14
|
+
* bun scripts/public-export.ts --leak-check --files a b … # 그 파일들만 — prepare 와 같은 변환·치환 «뒤»에 잰다(pr land 가 부른다)
|
|
14
15
|
*
|
|
15
16
|
* ⛔ 목록 밖은 «전부» private 에 남는다 — 이 스크립트가 무엇을 «더» 넣는 일은 없다.
|
|
16
17
|
* ⛔ 원천은 `git ls-files`(추적 파일)다 — 작업 트리의 untracked·ignored 는 원리상 안 간다.
|
|
@@ -379,6 +380,9 @@ export function run(argv: readonly string[], root = resolve(import.meta.dir, '..
|
|
|
379
380
|
const pathIndex = argv.indexOf('--path');
|
|
380
381
|
const pathPrefix = pathIndex >= 0 ? argv[pathIndex + 1] : undefined;
|
|
381
382
|
if (pathIndex >= 0 && !pathPrefix) { console.error('⛔ --path needs a prefix'); return 2; }
|
|
383
|
+
const filesIndex = argv.indexOf('--files');
|
|
384
|
+
const onlyFiles = filesIndex >= 0 ? new Set(argv.slice(filesIndex + 1).filter((a) => !a.startsWith('--'))) : undefined;
|
|
385
|
+
const inScope = (f: string) => (!pathPrefix || f.startsWith(pathPrefix)) && (!onlyFiles || onlyFiles.has(f));
|
|
382
386
|
const outIndex = argv.indexOf('--out');
|
|
383
387
|
const out = outIndex >= 0 ? argv[outIndex + 1] : undefined;
|
|
384
388
|
if (outIndex >= 0 && !out) { console.error('⛔ --out needs a directory'); return 2; }
|
|
@@ -411,9 +415,9 @@ export function run(argv: readonly string[], root = resolve(import.meta.dir, '..
|
|
|
411
415
|
if (!existsSync(join(root, src))) { console.error(`⛔ replace source missing: ${src}`); return 2; }
|
|
412
416
|
contents.set(dest, readFileSync(join(root, src), 'utf8'));
|
|
413
417
|
}
|
|
414
|
-
const scanned =
|
|
418
|
+
const scanned = files.filter(inScope);
|
|
415
419
|
const realDocs = privateDocNames(tracked, files);
|
|
416
|
-
const before = [...scanLeaks(root, scanned, LEAK_MARKERS, undefined, realDocs), ...scanRuntimePaths(root, files, tracked).filter((h) =>
|
|
420
|
+
const before = [...scanLeaks(root, scanned, LEAK_MARKERS, undefined, realDocs), ...scanRuntimePaths(root, files, tracked).filter((h) => inScope(h.file))];
|
|
417
421
|
const transformedByRules = transformExportFiles(contents, config, files);
|
|
418
422
|
// ⭐ 개인 치환표(저장소 밖) — 규칙 변환 «뒤»에 건다. 없으면 «못 봤다»로 막는다.
|
|
419
423
|
const redactions = loadPrivateRedactions();
|
|
@@ -445,12 +449,12 @@ export function run(argv: readonly string[], root = resolve(import.meta.dir, '..
|
|
|
445
449
|
console.error(`exported ${files.length} files (+${Object.keys(config.replace).length} replaced) → ${target}`);
|
|
446
450
|
}
|
|
447
451
|
const hits = [
|
|
448
|
-
...gitIgnoredExportFiles(root, files).filter(
|
|
452
|
+
...gitIgnoredExportFiles(root, files).filter(inScope).map((file) => ({ marker: 'export-gitignored', file, line: 0, text: '공개본 .gitignore 에 걸린다 — 커밋하면 사라진다' })),
|
|
449
453
|
...scanLeaks(root, scanned, LEAK_MARKERS, transformed.contents, realDocs),
|
|
450
454
|
...(redactions ? scanLeaks(root, scanned, privateIdentifierMarkers(redactions), transformed.contents, realDocs) : []),
|
|
451
455
|
...(!redactions && !noPrivateList ? [{ marker: 'private-identifiers-unchecked', file: privateRedactionsPath(), line: 0, text: 'private redaction list missing' }] : []),
|
|
452
456
|
];
|
|
453
|
-
const advisory = scanRuntimePaths(root, files, tracked, transformed.contents).filter((h) =>
|
|
457
|
+
const advisory = scanRuntimePaths(root, files, tracked, transformed.contents).filter((h) => inScope(h.file));
|
|
454
458
|
const summary = summarizeLeaks(hits);
|
|
455
459
|
const advisorySummary = summarizeLeaks(advisory);
|
|
456
460
|
const beforeSummary = summarizeLeaks(before);
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { existsSync, readdirSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { junitFailures, parseFailures } from './gate-diff';
|
|
4
|
+
|
|
5
|
+
export function baselineFromCutLogs(dir: string, expectedCommit?: string): { failures: string[]; errors: string[]; files: number; complete: boolean } | undefined {
|
|
6
|
+
if (!existsSync(dir)) return undefined;
|
|
7
|
+
let names: string[];
|
|
8
|
+
try { names = readdirSync(dir); }
|
|
9
|
+
catch { return undefined; }
|
|
10
|
+
const metadata = (name: string): { rc?: unknown; files?: unknown; shardCount?: unknown; commit?: unknown } | undefined => {
|
|
11
|
+
try {
|
|
12
|
+
const value: unknown = JSON.parse(readFileSync(join(dir, name), 'utf8'));
|
|
13
|
+
return value && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
|
|
14
|
+
} catch { return undefined; }
|
|
15
|
+
};
|
|
16
|
+
const logs = names.filter((name) => /^pod-\d+(?:-[\w-]+)?\.log$/.test(name));
|
|
17
|
+
if (!logs.length) return undefined;
|
|
18
|
+
|
|
19
|
+
// A split parent's output is partial; only its measured leaves belong to the cut.
|
|
20
|
+
const leaves = logs.filter((name) => !names.some((other) => other.startsWith(name.slice(0, -4) + '-')
|
|
21
|
+
&& /^pod-\d+(?:-[\w-]+)?\.json$/.test(other)));
|
|
22
|
+
const failures = new Set<string>();
|
|
23
|
+
const errors = new Set<string>();
|
|
24
|
+
const files = new Set<string>();
|
|
25
|
+
let measured = true;
|
|
26
|
+
const measuredFiles = new Set<string>();
|
|
27
|
+
for (const name of leaves) {
|
|
28
|
+
const prefix = name.slice(0, -4);
|
|
29
|
+
const junitName = `${prefix}.junit.xml`;
|
|
30
|
+
let output: string;
|
|
31
|
+
let xml: string;
|
|
32
|
+
try {
|
|
33
|
+
output = readFileSync(join(dir, name), 'utf8');
|
|
34
|
+
xml = names.includes(junitName) ? readFileSync(join(dir, junitName), 'utf8') : '';
|
|
35
|
+
} catch {
|
|
36
|
+
measured = false;
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
const named = new Set([...parseFailures(output), ...junitFailures(xml)]);
|
|
40
|
+
for (const id of named) failures.add(id);
|
|
41
|
+
for (const match of xml.matchAll(/<testsuite\b[^>]*\bfile="([^"]+)"/g)) files.add(match[1]!);
|
|
42
|
+
const shard = names.includes(`${prefix}.json`) ? metadata(`${prefix}.json`) : undefined;
|
|
43
|
+
const ran = [...output.matchAll(/Ran (\d+) tests? across (\d+) files?/g)].at(-1);
|
|
44
|
+
const reported = [...output.matchAll(/(?:^|\n)\s*(\d+) fail\s*(?=\n|$)/g)].at(-1);
|
|
45
|
+
const junitFiles = new Set([...xml.matchAll(/<testsuite\b[^>]*\bfile="([^"]+)"/g)].map((match) => match[1]!));
|
|
46
|
+
if (!shard || (shard.rc !== 0 && shard.rc !== 1) || (expectedCommit && shard.commit !== expectedCommit)
|
|
47
|
+
|| !ran || Number(ran[1]) < 1 || junitFiles.size !== Number(ran[2])
|
|
48
|
+
|| !reported || Number(reported[1]) !== named.size || !Array.isArray(shard.files)
|
|
49
|
+
|| !shard.files.every((file): file is string => typeof file === 'string')) measured = false;
|
|
50
|
+
else for (const file of shard.files) measuredFiles.add(file);
|
|
51
|
+
let file: string | undefined;
|
|
52
|
+
let attributedErrors = 0;
|
|
53
|
+
for (const raw of output.replace(/\x1b\[[0-9;]*[A-Za-z]/g, '').split(/\r?\n/)) {
|
|
54
|
+
const line = raw.trim();
|
|
55
|
+
const header = /^(?:\.\/)?((?:[\w.-]+\/)+[\w.-]+\.test\.tsx?):(?:\s|$)/.exec(line);
|
|
56
|
+
if (header) file = header[1];
|
|
57
|
+
if (/^# Unhandled error between tests/.test(line)) {
|
|
58
|
+
if (!file) measured = false;
|
|
59
|
+
else {
|
|
60
|
+
errors.add(`${file} > [error]`);
|
|
61
|
+
attributedErrors++;
|
|
62
|
+
file = undefined;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
const reportedErrors = [...output.matchAll(/(?:^|\n)\s*(\d+) errors?\s*(?=\n|$)/g)].at(-1);
|
|
67
|
+
if ((reportedErrors ? Number(reportedErrors[1]) : 0) !== attributedErrors
|
|
68
|
+
|| (shard?.rc === 1 && named.size + attributedErrors === 0)
|
|
69
|
+
|| (shard?.rc === 0 && named.size + attributedErrors > 0)) measured = false;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const plannedFiles = new Set<string>();
|
|
73
|
+
const roots = names.filter((name) => /^pod-\d+\.json$/.test(name));
|
|
74
|
+
const allMetadata = names.filter((name) => /^pod-\d+(?:-[\w-]+)?\.json$/.test(name)).map(metadata);
|
|
75
|
+
if (allMetadata.some((shard) => !shard || (expectedCommit && shard.commit !== expectedCommit))) measured = false;
|
|
76
|
+
const rootMetadata = roots.map(metadata);
|
|
77
|
+
for (const shard of rootMetadata) {
|
|
78
|
+
if (!shard || (expectedCommit && shard.commit !== expectedCommit)
|
|
79
|
+
|| !Array.isArray(shard.files) || !shard.files.every((file): file is string => typeof file === 'string')) measured = false;
|
|
80
|
+
else for (const file of shard.files) plannedFiles.add(file);
|
|
81
|
+
}
|
|
82
|
+
const count = rootMetadata[0]?.shardCount;
|
|
83
|
+
const complete = measured && rootMetadata.every((shard) => shard?.shardCount === count)
|
|
84
|
+
&& roots.length === count
|
|
85
|
+
&& plannedFiles.size > 0 && plannedFiles.size === measuredFiles.size
|
|
86
|
+
&& [...plannedFiles].every((file) => measuredFiles.has(file))
|
|
87
|
+
&& files.size === measuredFiles.size && [...measuredFiles].every((file) => files.has(file))
|
|
88
|
+
&& typeof count === 'number' && Number.isSafeInteger(count) && count > 0
|
|
89
|
+
&& Array.from({ length: count }, (_, index) => index).every((index) => names.includes(`pod-${index}.json`)
|
|
90
|
+
&& leaves.some((name) => name.startsWith(`pod-${index}.`) || name.startsWith(`pod-${index}-`)));
|
|
91
|
+
return { failures: [...failures].sort(), errors: [...errors].sort(), files: files.size, complete };
|
|
92
|
+
}
|
|
@@ -7,14 +7,14 @@ export function runChecklistGate(context: GraphContext = readGraphContext()) {
|
|
|
7
7
|
const data = listChecklist(version);
|
|
8
8
|
const gate = checklistGate(version);
|
|
9
9
|
const counts = summarizeChecklist(data);
|
|
10
|
-
const summary = `확인표 🟢${counts.green} 🟡${counts.yellow}(이동 ${gate.moved.length} · 알려진 문제 ${gate.knownIssues.length} · 막음 ${gate.blocked.length} · 판정 없음 ${gate.undecided.length}) 🔴${counts.red}${gate.red.length ? ` (${gate.red.join(', ')})` : ''}`;
|
|
10
|
+
const summary = `확인표 🟢${counts.green} 🟡${counts.yellow}(이동 ${gate.moved.length} · 알려진 문제 ${gate.knownIssues.length} · 막음 ${gate.blocked.length} · 판정 없음 ${gate.undecided.length}) 🔴${counts.red}${gate.red.length ? ` (${gate.red.join(', ')})` : ''}${gate.parity?.length ? ` · ⚠ 짝 경고 ${gate.parity.length}(${gate.parity.map((p) => p.id).join(', ')})` : ''}`;
|
|
11
11
|
if (gate.ok && gate.moved.length) {
|
|
12
12
|
const [major, minor, patch] = version.split('.').map(Number);
|
|
13
13
|
const next = `${major}.${minor}.${patch! + 1}`;
|
|
14
14
|
for (const id of gate.moved) {
|
|
15
15
|
const item = data.items.find((candidate) => candidate.id === id)!;
|
|
16
16
|
if (listChecklist(next).items.some((candidate) => candidate.id === id)) continue;
|
|
17
|
-
try { addItem(next, { id, title: item.title, ...(item.owner !== undefined ? { owner: item.owner } : {}) }); }
|
|
17
|
+
try { addItem(next, { id, title: item.title, ...(item.owner !== undefined ? { owner: item.owner } : {}), ...(item.kind !== undefined ? { kind: item.kind } : {}) }); }
|
|
18
18
|
catch (error) {
|
|
19
19
|
if (!listChecklist(next).items.some((candidate) => candidate.id === id)) throw error;
|
|
20
20
|
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
|
|
4
|
+
/** The identity is the complete Bun failure id, not its containing test file. */
|
|
5
|
+
export function loadEnvKnownFailures(repoRoot: string): Set<string> {
|
|
6
|
+
const path = join(repoRoot, 'test/env-known-failures.json');
|
|
7
|
+
if (!existsSync(path)) return new Set();
|
|
8
|
+
let data: unknown;
|
|
9
|
+
try { data = JSON.parse(readFileSync(path, 'utf8')); }
|
|
10
|
+
catch (error) { throw new Error(`invalid environment known failures: ${path}`, { cause: error }); }
|
|
11
|
+
if (!data || typeof data !== 'object' || Array.isArray(data)
|
|
12
|
+
|| !('env' in data) || data.env !== 'linux-pod'
|
|
13
|
+
|| !('measuredAt' in data) || typeof data.measuredAt !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(data.measuredAt)
|
|
14
|
+
|| !('tests' in data) || !Array.isArray(data.tests)
|
|
15
|
+
|| !data.tests.every((entry: unknown) => entry && typeof entry === 'object' && !Array.isArray(entry)
|
|
16
|
+
&& 'id' in entry && typeof entry.id === 'string'
|
|
17
|
+
&& /^(?:[\w.-]+\/)+[\w.-]+\.test\.tsx? > \S.*$/.test(entry.id)
|
|
18
|
+
&& 'reason' in entry && typeof entry.reason === 'string' && entry.reason.trim().length > 0)) {
|
|
19
|
+
throw new Error(`invalid environment known failures: ${path}`);
|
|
20
|
+
}
|
|
21
|
+
const ids = data.tests.map((entry: { id: string }) => entry.id);
|
|
22
|
+
if (new Set(ids).size !== ids.length) throw new Error(`invalid environment known failures: duplicate id in ${path}`);
|
|
23
|
+
return new Set(ids);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function splitKnownEnv(failures: string[], known: Set<string>): { counted: string[]; knownEnv: string[] } {
|
|
27
|
+
return {
|
|
28
|
+
counted: failures.filter((id) => !known.has(id)),
|
|
29
|
+
knownEnv: failures.filter((id) => known.has(id)),
|
|
30
|
+
};
|
|
31
|
+
}
|