Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/cli/ui/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -918,8 +918,7 @@ function AppInner({
stagedInput ||
pendingCheckpoint ||
pendingRevision ||
pendingReviseEditor ||
(planStepsRef.current && planStepsRef.current.length > 0 && !planMode)
pendingReviseEditor
);
// Wall-clock when the latest tool_start fired. Cleared when the
// matching `tool` event arrives (or at turn end). Tools are
Expand Down
6 changes: 3 additions & 3 deletions src/loop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1153,9 +1153,6 @@ export class CacheFirstLoop {
}

if (repairedCalls.length === 0) {
if (this._steerQueue.length > 0) {
continue;
}
if (allSuppressed) {
try {
yield* forceSummaryAfterIterLimit(this.summaryContext(), { reason: "stuck" });
Expand All @@ -1165,6 +1162,9 @@ export class CacheFirstLoop {
}
return;
}
if (this._steerQueue.length > 0) {
continue;
}
restoreModelIfNeeded();
yield { turn: this._turn, role: "done", content: assistantContent };
this._steerQueue.length = 0;
Expand Down
9 changes: 8 additions & 1 deletion src/tools/shell/parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,14 @@ export function isAllowed(
if (projectRoot) {
const root = pathMod.resolve(projectRoot);
for (const tok of argv) {
if (!tok || tok.startsWith("-") || tok.includes("://") || tok.startsWith("$")) continue;
if (
!tok ||
tok.startsWith("-") ||
tok.startsWith("/") ||
tok.includes("://") ||
tok.startsWith("$")
)
continue;
let expanded = tok;
if (expanded.startsWith("~")) expanded = pathMod.join(homedir(), expanded.slice(1));
const resolved = pathMod.resolve(root, expanded);
Expand Down
Loading