@cbartens/bkit 6.1.0 → 6.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.bkit/README.md +14 -12
- package/.bkit/core/.agents/docs.md +1 -11
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-gateguard.cjs +30 -9
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-guardrails.cjs +25 -27
- package/.bkit/core/.agents/rules.md +22 -9
- package/.bkit/core/.bkit/README.md +13 -11
- package/.bkit/core/.bkit/authoring.md +58 -13
- package/.bkit/core/.bkit/cli.md +43 -33
- package/.bkit/core/.bkit/cloud.md +93 -30
- package/.bkit/core/.bkit/install.md +55 -16
- package/.bkit/core/.bkit/jsonl.md +24 -7
- package/.bkit/core/.bkit/pipeline.md +8 -8
- package/.bkit/core/.bkit/prompts.md +160 -43
- package/.bkit/core/.bkit/providers.md +99 -36
- package/.bkit/core/.bkit/templates.md +167 -37
- package/.bkit/core/.bkit/trackers.md +39 -6
- package/.bkit/core/.bkit/workflows.md +344 -136
- package/.bkit/core/.claude/hooks/bkit-guardrails.cjs +50 -27
- package/.bkit/core/.claude/hooks/bkit-preflight.sh +11 -11
- package/.bkit/core/.codex/hooks/bkit-gateguard.cjs +13 -8
- package/.bkit/core/.codex/hooks/bkit-guardrails.cjs +14 -25
- package/.bkit/core/.cursor/hooks/bkit-guardrails.cjs +20 -9
- package/.bkit/core/.cursor/hooks/bkit-preflight.sh +8 -8
- package/.bkit/core/.opencode/plugin/bkit-gateguard.js +14 -4
- package/.bkit/core/.opencode/plugin/bkit-guardrails.js +114 -0
- package/.bkit/core/docs/templates/bkit-audit-accessibility.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-adoption.md +30 -6
- package/.bkit/core/docs/templates/bkit-audit-agents.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-aio-seo.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-analytics.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-annotations.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-app-performance.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-app-store.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-architecture.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-ci-performance.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-config.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-cost.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-coverage.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-database.md +3 -3
- package/.bkit/core/docs/templates/bkit-audit-dead-code.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-deferrals.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-dependencies.md +3 -3
- package/.bkit/core/docs/templates/bkit-audit-documentation.md +32 -2
- package/.bkit/core/docs/templates/bkit-audit-duplication.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-failures.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-flakes.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-gates.md +5 -3
- package/.bkit/core/docs/templates/bkit-audit-issues.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-llm.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-logs.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-models.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-privacy.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-prompts.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-red-team.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-reliability.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-repo.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-security.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-slop.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-testing.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-usability.md +1 -1
- package/.bkit/core/docs/templates/bkit-plan.md +38 -8
- package/.bkit/core/engine/checks/after/auth.ts +118 -47
- package/.bkit/core/engine/checks/after/github.ts +161 -37
- package/.bkit/core/engine/checks/after/index.ts +18 -3
- package/.bkit/core/engine/checks/after/tools.ts +245 -1
- package/.bkit/core/engine/checks/before/files.ts +59 -1
- package/.bkit/core/engine/checks/before/index.ts +8 -0
- package/.bkit/core/engine/checks/status-holes.ts +20 -26
- package/.bkit/core/engine/checks/tips/catalogue.ts +107 -10
- package/.bkit/core/engine/checks/tips/detect.ts +36 -3
- package/.bkit/core/engine/checks/tips/index.ts +1 -1
- package/.bkit/core/engine/cli.ts +13 -13
- package/.bkit/core/engine/commands/ci/ci.ts +124 -19
- package/.bkit/core/engine/commands/ci/push-gate.ts +101 -43
- package/.bkit/core/engine/commands/install/doctor.ts +5 -5
- package/.bkit/core/engine/commands/install/install.ts +28 -25
- package/.bkit/core/engine/commands/install/uninstall.ts +42 -30
- package/.bkit/core/engine/commands/install/upgrade.ts +14 -2
- package/.bkit/core/engine/commands/land.ts +2 -3
- package/.bkit/core/engine/commands/lib.ts +394 -39
- package/.bkit/core/engine/commands/registry.ts +1 -1
- package/.bkit/core/engine/commands/workflow/branches.ts +351 -78
- package/.bkit/core/engine/commands/workflow/challenge.ts +63 -14
- package/.bkit/core/engine/commands/workflow/context.ts +71 -10
- package/.bkit/core/engine/commands/workflow/counters.ts +298 -23
- package/.bkit/core/engine/commands/workflow/decisions.ts +260 -125
- package/.bkit/core/engine/commands/workflow/disk.ts +2 -1
- package/.bkit/core/engine/commands/workflow/feature-base.ts +66 -0
- package/.bkit/core/engine/commands/workflow/issues.ts +312 -17
- package/.bkit/core/engine/commands/workflow/junit.ts +204 -0
- package/.bkit/core/engine/commands/workflow/ledgers.ts +904 -99
- package/.bkit/core/engine/commands/workflow/locks.ts +186 -29
- package/.bkit/core/engine/commands/workflow/loops.ts +87 -0
- package/.bkit/core/engine/commands/workflow/open-decision.ts +251 -0
- package/.bkit/core/engine/commands/workflow/plan-blocks.ts +8 -0
- package/.bkit/core/engine/commands/workflow/plans.ts +1 -1
- package/.bkit/core/engine/commands/workflow/prs.ts +311 -16
- package/.bkit/core/engine/commands/workflow/repo.ts +1 -1
- package/.bkit/core/engine/commands/workflow/run-facts.ts +6 -0
- package/.bkit/core/engine/commands/workflow/runs.ts +877 -174
- package/.bkit/core/engine/commands/workflow/runtime.ts +12 -4
- package/.bkit/core/engine/commands/workflow/status.ts +324 -11
- package/.bkit/core/engine/commands/workflow/step-table.ts +41 -15
- package/.bkit/core/engine/commands/workflow/steps.ts +604 -29
- package/.bkit/core/engine/commands/workflow/summary-findings.ts +1 -1
- package/.bkit/core/engine/commands/workflow/summary.ts +314 -8
- package/.bkit/core/engine/commands/workflow/tasks.ts +400 -27
- package/.bkit/core/engine/commands/workflow/tests-base.ts +319 -0
- package/.bkit/core/engine/commands/workflow/tests-changed.ts +138 -74
- package/.bkit/core/engine/commands/workflow/tests-jump.ts +93 -0
- package/.bkit/core/engine/commands/workflow/tests.ts +815 -182
- package/.bkit/core/engine/commands/workflow/tracker.ts +1134 -137
- package/.bkit/core/engine/commands/workflow/workflows.ts +100 -72
- package/.bkit/core/engine/commands/workflow/worktrees.ts +421 -57
- package/.bkit/core/engine/install/cloud-env.ts +38 -10
- package/.bkit/core/engine/install/managed-block.ts +105 -0
- package/.bkit/core/engine/install/manifest.ts +7 -1
- package/.bkit/core/engine/install/modules/claude.ts +6 -2
- package/.bkit/core/engine/install/modules/cloud.ts +84 -95
- package/.bkit/core/engine/install/modules/codex.ts +10 -2
- package/.bkit/core/engine/install/modules/core.ts +202 -26
- package/.bkit/core/engine/install/modules/opencode.ts +18 -23
- package/.bkit/core/engine/install/network-allowlist.ts +8 -3
- package/.bkit/core/engine/install/project-docs.ts +650 -0
- package/.bkit/core/engine/install/template-copies.ts +58 -5
- package/.bkit/core/engine/install/write.ts +128 -7
- package/.bkit/core/engine/ledgers/journal.ts +18 -10
- package/.bkit/core/engine/ledgers/migrate.ts +20 -8
- package/.bkit/core/engine/ledgers/status.ts +604 -8
- package/.bkit/core/engine/ledgers/telemetry.ts +115 -13
- package/.bkit/core/engine/render/trackers.ts +46 -11
- package/.bkit/core/engine/shared/package-manager.ts +7 -3
- package/.bkit/core/engine/shared/settings.ts +12 -1
- package/.bkit/core/engine/shared/text.ts +14 -0
- package/.bkit/core/engine/tools/instructions-sources.ts +1 -0
- package/.bkit/core/engine/tools/instructions.ts +116 -20
- package/.bkit/core/hooks/antigravity-hook.js +20 -4
- package/.bkit/core/hooks/gateguard-edit-payload.js +8 -5
- package/.bkit/core/hooks/gateguard-engine.js +249 -23
- package/.bkit/core/hooks/guardrails-deny.js +167 -0
- package/.bkit/core/hooks/guardrails-read.js +3 -3
- package/.bkit/core/hooks/guardrails-shell.js +1122 -167
- package/.bkit/core/hooks/guardrails-tiers.js +247 -176
- package/.bkit/core/hooks/preflight-tracker.sh +219 -0
- package/.bkit/core/prompts/bkit-audit-generate.md +23 -6
- package/.bkit/core/prompts/bkit-build-challenge-1.md +5 -4
- package/.bkit/core/prompts/bkit-build-challenge-2.md +6 -5
- package/.bkit/core/prompts/bkit-build-install-skills.md +2 -2
- package/.bkit/core/prompts/bkit-build-plan-convert.md +21 -7
- package/.bkit/core/prompts/bkit-build-plan-current.md +5 -4
- package/.bkit/core/prompts/bkit-build-plan-gaps-remediate.md +22 -17
- package/.bkit/core/prompts/bkit-build-plan-tasks.md +16 -12
- package/.bkit/core/prompts/bkit-build-plan-tests.md +14 -10
- package/.bkit/core/prompts/bkit-build-plan-verify.md +21 -8
- package/.bkit/core/prompts/bkit-debug-abort-handover.md +10 -5
- package/.bkit/core/prompts/bkit-debug-failure-diagnose.md +22 -6
- package/.bkit/core/prompts/bkit-debug-failure-remediate.md +19 -3
- package/.bkit/core/prompts/bkit-debug-failure-reproduce.md +22 -6
- package/.bkit/core/prompts/bkit-debug-failure-soak.md +10 -7
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-1.md +3 -3
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-2.md +4 -4
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-3.md +3 -3
- package/.bkit/core/prompts/bkit-design-generate.md +6 -4
- package/.bkit/core/prompts/bkit-design-organise.md +4 -3
- package/.bkit/core/prompts/bkit-design-review-1.md +5 -4
- package/.bkit/core/prompts/bkit-design-review-2.md +6 -5
- package/.bkit/core/prompts/bkit-design-spike.md +4 -3
- package/.bkit/core/prompts/bkit-design-update.md +6 -4
- package/.bkit/core/prompts/bkit-plan-generate.md +35 -14
- package/.bkit/core/prompts/bkit-plan-review-1.md +9 -7
- package/.bkit/core/prompts/bkit-plan-review-2.md +9 -7
- package/.bkit/core/prompts/bkit-plan-scope-check.md +8 -6
- package/.bkit/core/prompts/bkit-plan-update.md +22 -8
- package/.bkit/core/prompts/bkit-ship-conflict-resolve.md +11 -8
- package/.bkit/core/prompts/bkit-ship-deferred-sweep.md +9 -5
- package/.bkit/core/prompts/bkit-ship-update-docs.md +26 -4
- package/.bkit/core/prompts/bkit-utility-compress-markdown.md +3 -3
- package/.bkit/core/prompts/bkit-utility-update-decisions.md +10 -7
- package/.bkit/core/prompts/bkit-utility-update-deferrals.md +8 -5
- package/.bkit/core/prompts/bkit-utility-update-documentation.md +31 -7
- package/.bkit/core/prompts/bkit-utility-update-failures.md +8 -5
- package/.bkit/core/prompts/bkit-utility-update-knowledge.md +10 -7
- package/.bkit/core/prompts/bkit-utility-update-roadmap.md +4 -4
- package/.bkit/core/prompts/bkit-utility-update-tracker.md +4 -4
- package/.bkit/core/workflows/bkit-auto.md +23 -11
- package/.bkit/core/workflows/bkit-build.md +331 -100
- package/.bkit/core/workflows/bkit-debug.md +135 -64
- package/.bkit/core/workflows/bkit-design.md +58 -32
- package/.bkit/core/workflows/bkit-plan.md +73 -45
- package/.bkit/core/workflows/bkit-ship.md +233 -167
- package/.bkit/shared/.agents/plugins/bkit/hooks.json +1 -1
- package/.bkit/shared/.bkit/.env.example +5 -0
- package/.bkit/shared/.claude/bkit-cloud.md +7 -7
- package/.bkit/shared/.claude/settings.json +5 -1
- package/.bkit/shared/.cursor/bkit-cloud.md +1 -1
- package/.bkit/shared/.cursor/hooks.json +1 -1
- package/.bkit/shared/.opencode/opencode.json +11 -2
- package/.bkit/templates/.claude/hooks/bkit-cloud-bootstrap.sh +27 -0
- package/.bkit/templates/.cursor/Dockerfile +7 -7
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-idea.yml +1 -1
- package/.bkit/templates/.github/dependabot.yml +5 -0
- package/.bkit/templates/.github/renovate.json5 +5 -3
- package/.bkit/templates/.github/workflows/bkit-ci.yml +11 -11
- package/.bkit/templates/.github/workflows/bkit-cloud.yml +525 -161
- package/.bkit/templates/.github/workflows/bkit-renovate.yml +2 -2
- package/.bkit/templates/.husky/pre-push +123 -6
- package/.bkit/templates/context/bkit-serena.md +1 -1
- package/.bkit/templates/context/bkit-vercel.md +103 -59
- package/.bkit/templates/docs/architecture.md +98 -0
- package/.bkit/templates/docs/capabilities.md +33 -37
- package/.bkit/templates/docs/components.md +142 -0
- package/.bkit/templates/docs/data-schema.md +87 -0
- package/.bkit/{shared → templates}/docs/deployments.md +128 -142
- package/.bkit/templates/docs/design.md +117 -0
- package/.bkit/templates/docs/noise.md +54 -0
- package/.bkit/templates/docs/observability.md +99 -0
- package/.bkit/templates/docs/security.md +137 -0
- package/.bkit/templates/docs/setup.md +93 -0
- package/.bkit/templates/docs/technology.md +70 -0
- package/.bkit/{shared → templates}/docs/testing.md +200 -87
- package/.bkit/templates/scripts/ci/bkit-check-accepted-divergences.mjs +1 -6
- package/.bkit/templates/scripts/ci/bkit-machine-lock.sh +511 -103
- package/.bkit/templates/scripts/ci/bkit-test-awake.mjs +314 -28
- package/.bkit/templates/scripts/ci/bkit-test-awake.test.mjs +500 -1
- package/.bkit/templates/scripts/graphify/bkit-graphify-graphml.py +1 -1
- package/.bkit/templates/scripts/graphify/bkit-graphify-rollup.py +91 -62
- package/.bkit/templates/scripts/graphify/bkit-graphify.sh +59 -11
- package/.bkit/templates/slop-scan.config.json +2 -0
- package/CHANGELOG.md +79 -0
- package/DETAILS.md +661 -0
- package/README.md +73 -604
- package/dist/checks/after/auth.js +114 -46
- package/dist/checks/after/github.js +138 -35
- package/dist/checks/after/index.js +16 -4
- package/dist/checks/after/tools.js +224 -1
- package/dist/checks/before/files.js +59 -1
- package/dist/checks/before/index.js +7 -1
- package/dist/checks/status-holes.js +20 -21
- package/dist/checks/tips/catalogue.js +99 -10
- package/dist/checks/tips/detect.js +35 -3
- package/dist/checks/tips/index.js +1 -1
- package/dist/cli.js +13 -13
- package/dist/commands/ci/ci.js +113 -20
- package/dist/commands/ci/push-gate.js +79 -44
- package/dist/commands/install/doctor.js +5 -5
- package/dist/commands/install/install.js +23 -22
- package/dist/commands/install/uninstall.js +36 -30
- package/dist/commands/install/upgrade.js +10 -2
- package/dist/commands/land.js +2 -3
- package/dist/commands/lib.js +323 -25
- package/dist/commands/workflow/branches.js +312 -72
- package/dist/commands/workflow/challenge.js +66 -13
- package/dist/commands/workflow/context.js +46 -10
- package/dist/commands/workflow/counters.js +231 -23
- package/dist/commands/workflow/decisions.js +221 -106
- package/dist/commands/workflow/disk.js +2 -1
- package/dist/commands/workflow/feature-base.js +60 -0
- package/dist/commands/workflow/issues.js +243 -15
- package/dist/commands/workflow/junit.js +137 -0
- package/dist/commands/workflow/ledgers.js +726 -112
- package/dist/commands/workflow/locks.js +150 -29
- package/dist/commands/workflow/loops.js +67 -0
- package/dist/commands/workflow/open-decision.js +199 -0
- package/dist/commands/workflow/plan-blocks.js +6 -0
- package/dist/commands/workflow/plans.js +1 -1
- package/dist/commands/workflow/prs.js +272 -16
- package/dist/commands/workflow/repo.js +1 -1
- package/dist/commands/workflow/run-facts.js +6 -0
- package/dist/commands/workflow/runs.js +747 -155
- package/dist/commands/workflow/runtime.js +8 -4
- package/dist/commands/workflow/status.js +259 -13
- package/dist/commands/workflow/step-table.js +41 -15
- package/dist/commands/workflow/steps.js +530 -26
- package/dist/commands/workflow/summary-findings.js +1 -1
- package/dist/commands/workflow/summary.js +289 -8
- package/dist/commands/workflow/tasks.js +294 -27
- package/dist/commands/workflow/tests-base.js +266 -0
- package/dist/commands/workflow/tests-changed.js +130 -56
- package/dist/commands/workflow/tests-jump.js +77 -0
- package/dist/commands/workflow/tests.js +608 -131
- package/dist/commands/workflow/tracker.js +920 -112
- package/dist/commands/workflow/workflows.js +80 -59
- package/dist/commands/workflow/worktrees.js +387 -58
- package/dist/install/cloud-env.js +32 -10
- package/dist/install/managed-block.js +101 -0
- package/dist/install/manifest.js +7 -1
- package/dist/install/modules/claude.js +6 -2
- package/dist/install/modules/cloud.js +73 -86
- package/dist/install/modules/codex.js +9 -2
- package/dist/install/modules/core.js +190 -27
- package/dist/install/modules/opencode.js +18 -23
- package/dist/install/network-allowlist.js +8 -3
- package/dist/install/project-docs.js +551 -0
- package/dist/install/template-copies.js +55 -5
- package/dist/install/write.js +117 -5
- package/dist/ledgers/journal.js +10 -8
- package/dist/ledgers/migrate.js +20 -9
- package/dist/ledgers/status.js +461 -8
- package/dist/ledgers/telemetry.js +71 -13
- package/dist/render/trackers.js +21 -12
- package/dist/shared/package-manager.js +7 -2
- package/dist/shared/settings.js +8 -0
- package/dist/shared/text.js +13 -0
- package/dist/tools/instructions-sources.js +1 -0
- package/dist/tools/instructions.js +97 -24
- package/package.json +23 -15
- package/.bkit/core/hooks/preflight-linear.sh +0 -73
- package/.bkit/shared/docs/architecture.md +0 -16
- package/.bkit/shared/docs/data-schema.md +0 -16
- package/.bkit/shared/docs/design.md +0 -38
- package/.bkit/shared/docs/noise.md +0 -20
- package/.bkit/shared/docs/observability.md +0 -22
- package/.bkit/shared/docs/security.md +0 -62
- package/.bkit/shared/docs/setup.md +0 -52
- package/.bkit/shared/docs/technology.md +0 -15
- /package/.bkit/templates/{.lintstagedrc.json → lintstagedrc.example.json} +0 -0
- /package/.bkit/templates/{.prettierignore → prettierignore.example} +0 -0
package/dist/commands/lib.js
CHANGED
|
@@ -8,11 +8,12 @@
|
|
|
8
8
|
// output keys and exit codes in its spec; `--help` and the convention test both read
|
|
9
9
|
// that spec, so the help text cannot drift from what the command accepts.
|
|
10
10
|
import { spawnSync } from "node:child_process";
|
|
11
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
11
12
|
import * as fs from "node:fs";
|
|
12
13
|
import * as os from "node:os";
|
|
13
14
|
import * as path from "node:path";
|
|
14
15
|
import { appendFrictionRow, appendJournalRow, engineCallRow, frictionRow, journalEnabled, launchedByGit, rebasePaused, shouldRecordFriction, } from "../ledgers/journal.js";
|
|
15
|
-
import { fold } from "../ledgers/status.js";
|
|
16
|
+
import { fold, isInvocationEvent } from "../ledgers/status.js";
|
|
16
17
|
import { gitEnv, resolveGitSha } from "../ledgers/telemetry.js";
|
|
17
18
|
import { parseJson } from "../shared/json.js";
|
|
18
19
|
import { renderText } from "../shared/text.js";
|
|
@@ -52,6 +53,56 @@ export class CommandError extends Error {
|
|
|
52
53
|
this.code = code;
|
|
53
54
|
}
|
|
54
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* A refusal the receiving handler declares as pre-effect validation: nothing was written,
|
|
58
|
+
* so a corrected retry of the same sub-step is permitted within its correction budget.
|
|
59
|
+
* Only this class (never a generic `CommandError`) carries that permission.
|
|
60
|
+
*/
|
|
61
|
+
export class NoWriteRejection extends CommandError {
|
|
62
|
+
detail;
|
|
63
|
+
constructor(code, message, detail) {
|
|
64
|
+
super(code, message);
|
|
65
|
+
this.detail = detail;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
/** A failure after an effect may have begun: the state must be reconciled, never auto-retried. */
|
|
69
|
+
export class UncertainEffect extends CommandError {
|
|
70
|
+
}
|
|
71
|
+
/** The correction budget of `scope` is spent: nothing was written and no further retry is allowed. */
|
|
72
|
+
export class CorrectionExhausted extends CommandError {
|
|
73
|
+
scope;
|
|
74
|
+
constructor(code, message, scope) {
|
|
75
|
+
super(code, message);
|
|
76
|
+
this.scope = scope;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
/** The structured `--json` error for the declared classes; every other error prints none. */
|
|
80
|
+
function structuredError(err) {
|
|
81
|
+
if (err instanceof CorrectionExhausted) {
|
|
82
|
+
return {
|
|
83
|
+
code: err.code,
|
|
84
|
+
message: err.message,
|
|
85
|
+
effects: "none",
|
|
86
|
+
correctable: false,
|
|
87
|
+
exhausted: true,
|
|
88
|
+
scope: err.scope,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
if (err instanceof NoWriteRejection) {
|
|
92
|
+
return {
|
|
93
|
+
code: err.code,
|
|
94
|
+
message: err.message,
|
|
95
|
+
effects: "none",
|
|
96
|
+
correctable: true,
|
|
97
|
+
scope: err.detail.scope,
|
|
98
|
+
substep: err.detail.substep,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
if (err instanceof UncertainEffect) {
|
|
102
|
+
return { code: err.code, message: err.message, effects: "uncertain", correctable: false };
|
|
103
|
+
}
|
|
104
|
+
return null;
|
|
105
|
+
}
|
|
55
106
|
/** Parse a whole-number flag, using its fallback only when absent. */
|
|
56
107
|
export const wholeNumber = (v, flag, fallback, min = 0) => {
|
|
57
108
|
if (v === undefined)
|
|
@@ -62,25 +113,60 @@ export const wholeNumber = (v, flag, fallback, min = 0) => {
|
|
|
62
113
|
}
|
|
63
114
|
return Number(s);
|
|
64
115
|
};
|
|
65
|
-
/** The
|
|
66
|
-
export
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
116
|
+
/** The env var naming the file the machine-lock `run` wrapper writes its give-up or refusal to. */
|
|
117
|
+
export const LOCK_STATUS_FILE_ENV = "LOCAL_STACK_LOCK_STATUS_FILE";
|
|
118
|
+
/** A fresh status file path for one gate run, in the OS temp folder; the file is not created. */
|
|
119
|
+
export function lockStatusFile() {
|
|
120
|
+
return path.join(os.tmpdir(), `bkit-lock-status-${process.pid}-${randomUUID()}`);
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Read and delete a status file. Null when it is absent, empty, not a regular file or
|
|
124
|
+
* unreadable: the wrapper took its lock, or it never wrote the file.
|
|
125
|
+
*/
|
|
126
|
+
export function readLockStatus(file) {
|
|
127
|
+
const stat = fs.statSync(file, { throwIfNoEntry: false });
|
|
128
|
+
if (stat === undefined || !stat.isFile())
|
|
129
|
+
return null;
|
|
130
|
+
let text;
|
|
131
|
+
try {
|
|
132
|
+
text = fs.readFileSync(file, "utf-8");
|
|
74
133
|
}
|
|
75
|
-
|
|
134
|
+
catch (err) {
|
|
135
|
+
const code = err.code;
|
|
136
|
+
if (code !== "EACCES" && code !== "EPERM")
|
|
137
|
+
throw err;
|
|
138
|
+
return null;
|
|
139
|
+
}
|
|
140
|
+
finally {
|
|
141
|
+
fs.rmSync(file, { force: true });
|
|
142
|
+
}
|
|
143
|
+
const fields = new Map();
|
|
144
|
+
for (const line of text.split("\n")) {
|
|
145
|
+
const eq = line.indexOf("=");
|
|
146
|
+
if (eq > 0)
|
|
147
|
+
fields.set(line.slice(0, eq), line.slice(eq + 1));
|
|
148
|
+
}
|
|
149
|
+
const lock = fields.get("lock");
|
|
150
|
+
const outcome = fields.get("outcome");
|
|
151
|
+
if (lock === undefined || outcome === undefined)
|
|
152
|
+
return null;
|
|
153
|
+
return { lock, outcome, holder: fields.get("holder") ?? "" };
|
|
76
154
|
}
|
|
77
|
-
/**
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
155
|
+
/**
|
|
156
|
+
* Classify a wrapped gate's result from its exit code and the status file only. `exitCode`
|
|
157
|
+
* is null when a caller in between (git running a pre-push hook) collapsed the status, so
|
|
158
|
+
* the file alone decides. Anything but a tests-lock give-up, refusal or hold-limit stop is
|
|
159
|
+
* the gate's own.
|
|
160
|
+
*/
|
|
161
|
+
export function classifyLockOutcome(exitCode, status) {
|
|
162
|
+
if (status === null || status.lock !== "tests")
|
|
163
|
+
return "gate";
|
|
164
|
+
const matches = (code) => exitCode === null || exitCode === code;
|
|
165
|
+
if (status.outcome === "gave-up" && matches(75))
|
|
81
166
|
return "lock-wait";
|
|
82
|
-
if (
|
|
83
|
-
|
|
167
|
+
if (status.outcome === "refused" && matches(73))
|
|
168
|
+
return "could-not-run";
|
|
169
|
+
if (status.outcome === "held-too-long" && matches(124))
|
|
84
170
|
return "could-not-run";
|
|
85
171
|
return "gate";
|
|
86
172
|
}
|
|
@@ -91,17 +177,17 @@ const camel = (kebab) => kebab.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase()
|
|
|
91
177
|
/** An orchestrator placeholder (`{FID}`, `{STATUS}`) the workflow should have substituted. */
|
|
92
178
|
const PLACEHOLDER = /\{[A-Z][A-Z0-9_]*\}/;
|
|
93
179
|
/** Refuse a flag value still carrying a literal `{UPPER}` placeholder. */
|
|
94
|
-
function refuseUnsubstituted(
|
|
180
|
+
function refuseUnsubstituted(spec, value) {
|
|
95
181
|
const hit = PLACEHOLDER.exec(value);
|
|
96
182
|
if (hit) {
|
|
97
|
-
throw new CommandError(EXIT.USAGE, `--${
|
|
183
|
+
throw new CommandError(spec.placeholderExit ?? EXIT.USAGE, `--${spec.name} carries the unsubstituted placeholder ${hit[0]} — substitute it before running`);
|
|
98
184
|
}
|
|
99
185
|
}
|
|
100
186
|
/**
|
|
101
187
|
* Parse `--flag=value` / `--flag value` / `--bool` against the verb's spec. Keys
|
|
102
188
|
* are filled in argv order, so a verb may render repeated or free-form flags in
|
|
103
189
|
* the order the caller gave them. A value holding a literal `{UPPER}` placeholder
|
|
104
|
-
* is refused (exit 2): the workflow passed it through unsubstituted.
|
|
190
|
+
* is refused (exit 2, or the flag's `placeholderExit`): the workflow passed it through unsubstituted.
|
|
105
191
|
*/
|
|
106
192
|
export function parseFlags(argv, specs) {
|
|
107
193
|
const byName = new Map(specs.map((s) => [s.name, s]));
|
|
@@ -114,7 +200,7 @@ export function parseFlags(argv, specs) {
|
|
|
114
200
|
if (!key || out[key] !== undefined) {
|
|
115
201
|
throw new CommandError(EXIT.USAGE, `unexpected argument "${arg}" — commands take flags only`);
|
|
116
202
|
}
|
|
117
|
-
refuseUnsubstituted(positional
|
|
203
|
+
refuseUnsubstituted(positional, arg);
|
|
118
204
|
out[key] = arg;
|
|
119
205
|
continue;
|
|
120
206
|
}
|
|
@@ -141,7 +227,7 @@ export function parseFlags(argv, specs) {
|
|
|
141
227
|
i++;
|
|
142
228
|
}
|
|
143
229
|
if (typeof value === "string")
|
|
144
|
-
refuseUnsubstituted(
|
|
230
|
+
refuseUnsubstituted(spec, value);
|
|
145
231
|
const key = camel(name);
|
|
146
232
|
if (spec.repeatable) {
|
|
147
233
|
const prior = out[key];
|
|
@@ -347,6 +433,181 @@ export function resolveActiveRun(opts) {
|
|
|
347
433
|
}
|
|
348
434
|
return found.length === 1 ? found[0] : undefined;
|
|
349
435
|
}
|
|
436
|
+
export const INVOCATION_FLAG = {
|
|
437
|
+
name: "invocation",
|
|
438
|
+
type: "string",
|
|
439
|
+
help: "invocation id from `bkit status invocation`; must be issued by this checkout, and any --workflow, --step, --agent or --file given must agree with it",
|
|
440
|
+
};
|
|
441
|
+
const INVOCATION_ID = /^inv-[0-9a-f]{32}$/;
|
|
442
|
+
/** `<git common dir>/bkit-outbox/invocation-context`: one receipt per issued invocation. */
|
|
443
|
+
export function invocationDir(cwd) {
|
|
444
|
+
const root = outboxRoot(cwd);
|
|
445
|
+
return root === null ? null : path.join(root, "invocation-context");
|
|
446
|
+
}
|
|
447
|
+
/** Persist an issued invocation; returns its receipt path. */
|
|
448
|
+
export function writeInvocation(cwd, inv) {
|
|
449
|
+
const dir = invocationDir(cwd);
|
|
450
|
+
if (dir === null)
|
|
451
|
+
throw new CommandError(EXIT.USAGE, `not inside a git repository: ${cwd}`);
|
|
452
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
453
|
+
const file = path.join(dir, `${inv.id}.json`);
|
|
454
|
+
fs.writeFileSync(file, `${JSON.stringify(inv)}\n`, { mode: 0o600, flag: "wx" });
|
|
455
|
+
return file;
|
|
456
|
+
}
|
|
457
|
+
/** A one-way fingerprint of a checkout's top: the committed `invocation` event never holds its path. */
|
|
458
|
+
export function worktreeFingerprint(top) {
|
|
459
|
+
return createHash("sha256").update(top).digest("hex").slice(0, 16);
|
|
460
|
+
}
|
|
461
|
+
/**
|
|
462
|
+
* Whether `file` resolves, symlinks included, to a path inside the checkout `top` and not in
|
|
463
|
+
* a worktree nested under it. A file that does not exist yet resolves through its parent.
|
|
464
|
+
*/
|
|
465
|
+
function resolvesInside(top, file) {
|
|
466
|
+
try {
|
|
467
|
+
const realTop = fs.realpathSync(top);
|
|
468
|
+
let real;
|
|
469
|
+
if (fs.existsSync(file) || fs.lstatSync(file, { throwIfNoEntry: false }) !== undefined) {
|
|
470
|
+
real = fs.realpathSync(file);
|
|
471
|
+
}
|
|
472
|
+
else {
|
|
473
|
+
real = path.join(fs.realpathSync(path.dirname(file)), path.basename(file));
|
|
474
|
+
}
|
|
475
|
+
if (real !== realTop && !real.startsWith(realTop + path.sep))
|
|
476
|
+
return false;
|
|
477
|
+
const owner = git(path.dirname(real), ["rev-parse", "--show-toplevel"]);
|
|
478
|
+
return owner === null || fs.realpathSync(owner) === realTop;
|
|
479
|
+
}
|
|
480
|
+
catch {
|
|
481
|
+
return false;
|
|
482
|
+
}
|
|
483
|
+
}
|
|
484
|
+
/**
|
|
485
|
+
* Rebuild the outbox receipt of run-scoped invocation `id` from its `invocation` event in a
|
|
486
|
+
* `status.jsonl` under this checkout. Reads only this checkout's books, so another
|
|
487
|
+
* worktree's run is never found. Returns whether a receipt now exists.
|
|
488
|
+
*/
|
|
489
|
+
function rebuildInvocation(cwd, id) {
|
|
490
|
+
const top = git(cwd, ["rev-parse", "--show-toplevel"]);
|
|
491
|
+
if (top === null)
|
|
492
|
+
return false;
|
|
493
|
+
let read = 0;
|
|
494
|
+
for (const month of subdirs(path.join(top, "docs", "plans"))) {
|
|
495
|
+
for (const fid of subdirs(path.join(top, "docs", "plans", month, "logs"))) {
|
|
496
|
+
if (++read > ACTIVE_RUN_SCAN_CAP)
|
|
497
|
+
return false;
|
|
498
|
+
const statusPath = path.join(top, statusRelPath(month, fid));
|
|
499
|
+
if (!fs.existsSync(statusPath))
|
|
500
|
+
continue;
|
|
501
|
+
// A status file symlinked out of the checkout is not this checkout's book.
|
|
502
|
+
if (!resolvesInside(top, statusPath))
|
|
503
|
+
continue;
|
|
504
|
+
for (const line of fs.readFileSync(statusPath, "utf-8").split("\n")) {
|
|
505
|
+
if (!line.includes(id))
|
|
506
|
+
continue;
|
|
507
|
+
const row = parseJson(line);
|
|
508
|
+
if (!row.ok || !isInvocationEvent(row.value) || row.value.id !== id)
|
|
509
|
+
continue;
|
|
510
|
+
const e = row.value;
|
|
511
|
+
// The event holds checkout-relative paths; they resolve against this top only.
|
|
512
|
+
if (e.worktree !== worktreeFingerprint(top) || path.join(top, e.statusPath) !== statusPath)
|
|
513
|
+
return false;
|
|
514
|
+
try {
|
|
515
|
+
writeInvocation(cwd, {
|
|
516
|
+
id,
|
|
517
|
+
version: 1,
|
|
518
|
+
scope: "run",
|
|
519
|
+
workflow: e.workflow,
|
|
520
|
+
step: e.step,
|
|
521
|
+
number: e.number,
|
|
522
|
+
title: e.title,
|
|
523
|
+
run: e.run,
|
|
524
|
+
statusPath,
|
|
525
|
+
bookRoot: path.join(top, e.bookRoot),
|
|
526
|
+
group: e.group,
|
|
527
|
+
attempt: e.attempt,
|
|
528
|
+
agent: e.agent,
|
|
529
|
+
host: e.host,
|
|
530
|
+
configuredModel: e.configuredModel,
|
|
531
|
+
observedModel: e.observedModel,
|
|
532
|
+
standalone: null,
|
|
533
|
+
name: null,
|
|
534
|
+
declaredStep: null,
|
|
535
|
+
allowedAgent: null,
|
|
536
|
+
worktree: top,
|
|
537
|
+
issuedAt: e.at,
|
|
538
|
+
});
|
|
539
|
+
}
|
|
540
|
+
catch {
|
|
541
|
+
// A concurrent rebuild may already have written the receipt; report whether one exists.
|
|
542
|
+
const dir = invocationDir(cwd);
|
|
543
|
+
return dir !== null && fs.existsSync(path.join(dir, `${id}.json`));
|
|
544
|
+
}
|
|
545
|
+
return true;
|
|
546
|
+
}
|
|
547
|
+
}
|
|
548
|
+
}
|
|
549
|
+
return false;
|
|
550
|
+
}
|
|
551
|
+
/**
|
|
552
|
+
* Resolve `--invocation` against the outbox and refuse (exit 2) a forged, unissued,
|
|
553
|
+
* other-checkout or stale id, and any asserted `--workflow`, `--step`, `--agent` or
|
|
554
|
+
* `--file` that disagrees with it. A run-scoped id is stale once a newer run of its
|
|
555
|
+
* workflow has started.
|
|
556
|
+
*/
|
|
557
|
+
export function resolveInvocation(cwd, id, flags) {
|
|
558
|
+
const refuse = (why) => {
|
|
559
|
+
throw new CommandError(EXIT.USAGE, `invocation ${id}: ${why}`);
|
|
560
|
+
};
|
|
561
|
+
if (!INVOCATION_ID.test(id))
|
|
562
|
+
return refuse("not an id issued by `bkit status invocation`");
|
|
563
|
+
const dir = invocationDir(cwd);
|
|
564
|
+
const file = dir === null ? null : path.join(dir, `${id}.json`);
|
|
565
|
+
if (file === null)
|
|
566
|
+
return refuse("not issued in this repository");
|
|
567
|
+
// The run's status log is the authority; a missing receipt is rebuilt from its event.
|
|
568
|
+
if (!fs.existsSync(file) && !rebuildInvocation(cwd, id))
|
|
569
|
+
return refuse("not issued in this repository");
|
|
570
|
+
const parsed = parseJson(fs.readFileSync(file, "utf-8"));
|
|
571
|
+
const inv = parsed.ok ? parsed.value : null;
|
|
572
|
+
if (inv === null || typeof inv !== "object" || inv.id !== id || inv.version !== 1)
|
|
573
|
+
return refuse("receipt is unreadable");
|
|
574
|
+
const top = git(cwd, ["rev-parse", "--show-toplevel"]);
|
|
575
|
+
if (top === null || top !== inv.worktree)
|
|
576
|
+
return refuse(`issued in another checkout (${inv.worktree})`);
|
|
577
|
+
if (inv.scope === "run") {
|
|
578
|
+
if (inv.statusPath === null || inv.workflow === null || inv.run === null)
|
|
579
|
+
return refuse("run receipt lacks its status file");
|
|
580
|
+
if (!fs.existsSync(inv.statusPath))
|
|
581
|
+
return refuse(`stale: ${inv.statusPath} is gone`);
|
|
582
|
+
if (!resolvesInside(top, inv.statusPath))
|
|
583
|
+
return refuse(`${inv.statusPath} resolves outside this checkout`);
|
|
584
|
+
const events = [];
|
|
585
|
+
for (const line of fs.readFileSync(inv.statusPath, "utf-8").split("\n")) {
|
|
586
|
+
const row = line.trim() === "" ? null : parseJson(line);
|
|
587
|
+
if (row?.ok && row.value !== null && typeof row.value === "object") {
|
|
588
|
+
const type = row.value.type;
|
|
589
|
+
if (typeof type === "string" && FOLD_TYPES.has(type))
|
|
590
|
+
events.push(row.value);
|
|
591
|
+
}
|
|
592
|
+
}
|
|
593
|
+
const started = fold(events).filter((r) => r.workflow === inv.workflow).length;
|
|
594
|
+
if (started > inv.run)
|
|
595
|
+
return refuse(`stale: a newer ${inv.workflow} run has started`);
|
|
596
|
+
if (started < inv.run - 1)
|
|
597
|
+
return refuse("stale: its run is gone");
|
|
598
|
+
}
|
|
599
|
+
const text = (v) => (typeof v === "string" ? v : undefined);
|
|
600
|
+
const conflict = (flag, given, bound) => refuse(`conflict: --${flag}=${given} disagrees with the invocation (${bound ?? "none"})`);
|
|
601
|
+
for (const flag of ["workflow", "step", "agent"]) {
|
|
602
|
+
const given = text(flags[flag]);
|
|
603
|
+
if (given !== undefined && given !== inv[flag])
|
|
604
|
+
conflict(flag, given, inv[flag]);
|
|
605
|
+
}
|
|
606
|
+
const file2 = text(flags["file"]);
|
|
607
|
+
if (file2 !== undefined && path.resolve(cwd, file2) !== inv.statusPath)
|
|
608
|
+
conflict("file", file2, inv.statusPath);
|
|
609
|
+
return inv;
|
|
610
|
+
}
|
|
350
611
|
/** The journal `runCommand` uses unless a caller injects one: writes into the active run's own books. */
|
|
351
612
|
function engineJournal() {
|
|
352
613
|
let resolved = false;
|
|
@@ -428,6 +689,22 @@ export async function runCommand(argv, commands, options) {
|
|
|
428
689
|
}
|
|
429
690
|
const rest = argv.slice(2);
|
|
430
691
|
if (rest.some(isHelp)) {
|
|
692
|
+
if (rest.includes("--json")) {
|
|
693
|
+
const s = cmd.verbs[verb];
|
|
694
|
+
io.stdout(`${JSON.stringify({
|
|
695
|
+
noun: cmd.noun,
|
|
696
|
+
verb,
|
|
697
|
+
summary: s.summary,
|
|
698
|
+
flags: s.flags.map((f) => ({
|
|
699
|
+
name: f.name,
|
|
700
|
+
type: f.type,
|
|
701
|
+
required: f.required === true,
|
|
702
|
+
})),
|
|
703
|
+
output: s.output,
|
|
704
|
+
exitCodes: s.exitCodes ?? {},
|
|
705
|
+
})}\n`);
|
|
706
|
+
return EXIT.OK;
|
|
707
|
+
}
|
|
431
708
|
io.stdout(verbHelp(cmd, verb));
|
|
432
709
|
return EXIT.OK;
|
|
433
710
|
}
|
|
@@ -471,9 +748,24 @@ export async function runCommand(argv, commands, options) {
|
|
|
471
748
|
}
|
|
472
749
|
ctx.json = own.length !== rest.length;
|
|
473
750
|
ctx.flags = parseFlags(own, spec.flags);
|
|
751
|
+
const invocationId = ctx.flags["invocation"];
|
|
752
|
+
if (typeof invocationId === "string" &&
|
|
753
|
+
spec.flags.some((f) => f.name === INVOCATION_FLAG.name && f.unresolved !== true)) {
|
|
754
|
+
ctx.invocation = resolveInvocation(ctx.cwd, invocationId, ctx.flags);
|
|
755
|
+
}
|
|
474
756
|
input = { noun: cmd.noun, verb, argv: rest, flags: ctx.flags, cwd: ctx.cwd };
|
|
475
757
|
const entered = input;
|
|
476
|
-
|
|
758
|
+
// An invocation-bound call writes its engine-call row into the issuing run's own status
|
|
759
|
+
// log (never another worktree's); a runless call has no run to write to.
|
|
760
|
+
// `status invocation` records itself as the run's `invocation` event, so it adds no second row.
|
|
761
|
+
const bound = ctx.invocation;
|
|
762
|
+
const selfRecorded = cmd.noun === "status" && verb === "invocation";
|
|
763
|
+
if (bound === undefined && !selfRecorded)
|
|
764
|
+
guarded(() => journal.call(entered));
|
|
765
|
+
else if (bound?.scope === "run" && bound.statusPath !== null) {
|
|
766
|
+
const own = { ...entered, flags: { ...entered.flags, file: bound.statusPath } };
|
|
767
|
+
guarded(() => journal.call(own));
|
|
768
|
+
}
|
|
477
769
|
outcome = null;
|
|
478
770
|
const code = await spec.run(ctx);
|
|
479
771
|
outcome = code;
|
|
@@ -483,6 +775,9 @@ export async function runCommand(argv, commands, options) {
|
|
|
483
775
|
if (!(err instanceof CommandError))
|
|
484
776
|
throw err;
|
|
485
777
|
io.stderr(`${tag} ${err.message}\n`);
|
|
778
|
+
const structured = ctx.json ? structuredError(err) : null;
|
|
779
|
+
if (structured !== null)
|
|
780
|
+
io.stdout(`${JSON.stringify({ error: structured })}\n`);
|
|
486
781
|
outcome = err.code;
|
|
487
782
|
return err.code;
|
|
488
783
|
}
|
|
@@ -552,6 +847,9 @@ export function runTool(cmd, args, cwd, opts = {}) {
|
|
|
552
847
|
env: { ...gitEnv(), ...opts.env },
|
|
553
848
|
input: opts.input,
|
|
554
849
|
maxBuffer: OUTPUT_LIMIT,
|
|
850
|
+
...(opts.timeoutMs === undefined
|
|
851
|
+
? {}
|
|
852
|
+
: { timeout: Math.max(1, Math.ceil(opts.timeoutMs)), killSignal: "SIGKILL" }),
|
|
555
853
|
});
|
|
556
854
|
if (res.error && res.pid === 0) {
|
|
557
855
|
return { found: false, status: 127, stdout: "", stderr: `${cmd} not found on PATH` };
|
|
@@ -569,8 +867,8 @@ export function runTool(cmd, args, cwd, opts = {}) {
|
|
|
569
867
|
}
|
|
570
868
|
const signalNumber = (signal) => (signal ? os.constants.signals[signal] : undefined) ?? 1;
|
|
571
869
|
/** `gh <args>` in `cwd`, never throwing; `input` goes to stdin; `env` is added to the child's. */
|
|
572
|
-
export function runGh(cwd, args, input, env) {
|
|
573
|
-
const res = runTool("gh", args, cwd, { input, env });
|
|
870
|
+
export function runGh(cwd, args, input, env, opts = {}) {
|
|
871
|
+
const res = runTool("gh", args, cwd, { input, env, ...opts });
|
|
574
872
|
return {
|
|
575
873
|
ok: res.found && res.status === 0,
|
|
576
874
|
stdout: res.stdout.trim(),
|