@rosthq/cli 0.7.128 → 0.7.129
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forge-workspace.d.ts","sourceRoot":"","sources":["../src/forge-workspace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"forge-workspace.d.ts","sourceRoot":"","sources":["../src/forge-workspace.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -64018,8 +64018,8 @@ function buildModelSpawnEnv(base, claudeConfigDir, codexHomeDir) {
|
|
|
64018
64018
|
}
|
|
64019
64019
|
var CLAUDE_CONFIG_AUTH_FILES = [".credentials.json", ".claude.json"];
|
|
64020
64020
|
function resolveSourceClaudeConfigDir(base) {
|
|
64021
|
-
const explicit = base.CLAUDE_CONFIG_DIR;
|
|
64022
|
-
if (
|
|
64021
|
+
const explicit = requireNonBlank("CLAUDE_CONFIG_DIR", base.CLAUDE_CONFIG_DIR);
|
|
64022
|
+
if (explicit !== null) {
|
|
64023
64023
|
return explicit;
|
|
64024
64024
|
}
|
|
64025
64025
|
const home = base.HOME;
|
|
@@ -66702,6 +66702,12 @@ async function prepareForgeTurn(ctx, workOrder, execution, runtime, seams) {
|
|
|
66702
66702
|
if (!workOrderId || !buildRequestId) {
|
|
66703
66703
|
return { ok: false, summary: "forge turn missing work order id or build request id" };
|
|
66704
66704
|
}
|
|
66705
|
+
let runtimeSourceHomes;
|
|
66706
|
+
try {
|
|
66707
|
+
runtimeSourceHomes = resolveRuntimeSourceHomes();
|
|
66708
|
+
} catch (error51) {
|
|
66709
|
+
return { ok: false, summary: `forge turn refused: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}` };
|
|
66710
|
+
}
|
|
66705
66711
|
const brokered = await brokerForgeCredential(ctx, workOrderId);
|
|
66706
66712
|
if (!brokered.ok) {
|
|
66707
66713
|
return { ok: false, summary: brokered.summary };
|
|
@@ -66754,7 +66760,8 @@ async function prepareForgeTurn(ctx, workOrder, execution, runtime, seams) {
|
|
|
66754
66760
|
],
|
|
66755
66761
|
allowNetwork: ctx.config.sandboxAllowNetwork,
|
|
66756
66762
|
modelRuntime: runtime,
|
|
66757
|
-
|
|
66763
|
+
// Resolved once at the top of this function (DER-2842) — before the workspace exists.
|
|
66764
|
+
...runtimeSourceHomes,
|
|
66758
66765
|
// DER-1485 (round 6): THIS turn's own codex isolate. Passed for EVERY runtime: it is what the
|
|
66759
66766
|
// profile re-allows read+write for a CODEX turn (codex reads and refresh-writes auth.json there,
|
|
66760
66767
|
// under the one profile it shares with its Bash child), and it is also what the legacy-flat-home
|
|
@@ -66955,20 +66962,31 @@ async function spawnRunnerTurn(ctx, workOrder, runtime, kind, resumeSessionIdOve
|
|
|
66955
66962
|
}
|
|
66956
66963
|
forgePrep = prepared.prep;
|
|
66957
66964
|
}
|
|
66958
|
-
|
|
66959
|
-
|
|
66960
|
-
|
|
66961
|
-
|
|
66962
|
-
|
|
66963
|
-
|
|
66964
|
-
|
|
66965
|
-
|
|
66966
|
-
|
|
66967
|
-
|
|
66968
|
-
|
|
66969
|
-
|
|
66970
|
-
|
|
66971
|
-
|
|
66965
|
+
let sandbox;
|
|
66966
|
+
if (forgePrep) {
|
|
66967
|
+
sandbox = forgePrep.sandbox;
|
|
66968
|
+
} else {
|
|
66969
|
+
let runtimeSourceHomes;
|
|
66970
|
+
try {
|
|
66971
|
+
runtimeSourceHomes = resolveRuntimeSourceHomes();
|
|
66972
|
+
} catch (error51) {
|
|
66973
|
+
return { ok: false, summary: `turn refused: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}` };
|
|
66974
|
+
}
|
|
66975
|
+
sandbox = resolveSandboxSpec({
|
|
66976
|
+
mode: ctx.config.sandboxMode,
|
|
66977
|
+
platform: process.platform,
|
|
66978
|
+
workspaceDir: tmpdir2(),
|
|
66979
|
+
tmpDir: tmpdir2(),
|
|
66980
|
+
homeDir: ctx.config.homeDir,
|
|
66981
|
+
stateFile: ctx.config.stateFile,
|
|
66982
|
+
runnerBaseDir: path10.join(ctx.config.homeDir, ".rost"),
|
|
66983
|
+
allowNetwork: ctx.config.sandboxAllowNetwork,
|
|
66984
|
+
modelRuntime: runtime,
|
|
66985
|
+
...runtimeSourceHomes,
|
|
66986
|
+
// DER-1485 (round 6): see above — allow is codex-only, the derived legacy deny is universal.
|
|
66987
|
+
codexIsolateHomeDir: stableCodexHomeDir(ctx.state, ctx.config.homeDir)
|
|
66988
|
+
});
|
|
66989
|
+
}
|
|
66972
66990
|
const repoDir = forgePrep ? forgePrep.repoDir : null;
|
|
66973
66991
|
const plan = resolveTurnPlan({ kind, execution, repoDir });
|
|
66974
66992
|
const mcp = typeof workOrder.mcp === "object" && workOrder.mcp !== null ? workOrder.mcp : {};
|
|
@@ -67164,6 +67182,12 @@ async function pollForQueueMerge(ctx, input) {
|
|
|
67164
67182
|
}
|
|
67165
67183
|
async function resolveMergeConflictTurn(ctx, input) {
|
|
67166
67184
|
const tenantId = typeof input.workOrder.tenant_id === "string" ? input.workOrder.tenant_id : ctx.state.tenant_id ?? "runner";
|
|
67185
|
+
let runtimeSourceHomes;
|
|
67186
|
+
try {
|
|
67187
|
+
runtimeSourceHomes = resolveRuntimeSourceHomes();
|
|
67188
|
+
} catch (error51) {
|
|
67189
|
+
return { pushed: false, result: { ok: false, summary: `[forge-merge] conflict turn refused: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}`.slice(0, MERGE_CONFLICT_SUMMARY_MAX) } };
|
|
67190
|
+
}
|
|
67167
67191
|
let workspace;
|
|
67168
67192
|
try {
|
|
67169
67193
|
workspace = await prepareMergeWorkspace({
|
|
@@ -67194,7 +67218,8 @@ async function resolveMergeConflictTurn(ctx, input) {
|
|
|
67194
67218
|
],
|
|
67195
67219
|
allowNetwork: ctx.config.sandboxAllowNetwork,
|
|
67196
67220
|
modelRuntime: input.runtime,
|
|
67197
|
-
|
|
67221
|
+
// Resolved once at the top of this function (DER-2842) — before the workspace exists.
|
|
67222
|
+
...runtimeSourceHomes,
|
|
67198
67223
|
// DER-1485 (round 6): see above — allow is codex-only, the derived legacy deny is universal.
|
|
67199
67224
|
codexIsolateHomeDir: stableCodexHomeDir(ctx.state, ctx.config.homeDir)
|
|
67200
67225
|
});
|