Skip to content

fix: clear residual print-result timeout to prevent stream-json hang #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bash0816 merged 2 commits into from
Jul 30, 2026
Merged

fix: clear residual print-result timeout to prevent stream-json hang #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f042090
wip: stream-json terminal watcher (unref removed, clearTimeout missing)
bash0816 Jul 29, 2026
90bc7b7
fix: clear residual print-result timeout to prevent stream-json hang
bash0816 Jul 30, 2026
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
9 changes: 9 additions & 0 deletions config/claude-native-audited-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,15 @@
"tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
"tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
"status": "termux_verified"
},
"2.1.220-3": {
"wrapper_spec": "@anthropic-ai/claude-code@2.1.220",
"native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.220",
"entry_js_offset": 243831156,
"entry_end_offset": 265457701,
"tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
"tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
"status": "offset_discovered"
}
}
}
2 changes: 1 addition & 1 deletion config/claude-termux-release-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 1,
"package_name": "@bash0816/claude-code",
"latest_audited_version": "2.1.220-2",
"latest_candidate_version": "2.1.220-2",
"latest_candidate_version": "2.1.220-3",
"previous_stable_version": "2.1.220",
"stable_pinned_version": "2.1.193",
"manifest_url": "https://raw.githubusercontent.com/bash0816/ClaudeCode-Termux/main/config/claude-termux-release-manifest.json"
Expand Down
9 changes: 9 additions & 0 deletions packages/claude-code/config/claude-native-audited-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,15 @@
"tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
"tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
"status": "termux_verified"
},
"2.1.220-3": {
"wrapper_spec": "@anthropic-ai/claude-code@2.1.220",
"native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.220",
"entry_js_offset": 243831156,
"entry_end_offset": 265457701,
"tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
"tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
"status": "offset_discovered"
}
}
}
2 changes: 1 addition & 1 deletion packages/claude-code/config/claude-termux-release-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 1,
"package_name": "@bash0816/claude-code",
"latest_audited_version": "2.1.220-2",
"latest_candidate_version": "2.1.220-2",
"latest_candidate_version": "2.1.220-3",
"previous_stable_version": "2.1.220",
"stable_pinned_version": "2.1.193",
"manifest_url": "https://raw.githubusercontent.com/bash0816/ClaudeCode-Termux/main/config/claude-termux-release-manifest.json"
Expand Down
225 changes: 225 additions & 0 deletions packages/claude-code/lib/termux-run-claude-native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,22 @@ const entryJsOffset = Number(process.env.ENTRY_JS_OFFSET);
const entryEndOffset = Number(process.env.ENTRY_END_OFFSET);
const argv = process.argv.slice(2);

function isStreamJsonPrintMode(argv) {
const dashDashIndex = argv.indexOf('--');
const ownArgs = dashDashIndex === -1 ? argv : argv.slice(0, dashDashIndex);
const hasPrintFlag = ownArgs.includes('-p') || ownArgs.includes('--print');
let hasStreamJsonFormat = false;
for (let i = 0; i < ownArgs.length; i++) {
const tok = ownArgs[i];
if (tok === '--output-format=stream-json') { hasStreamJsonFormat = true; break; }
if (tok === '--output-format' && ownArgs[i + 1] === 'stream-json') {
hasStreamJsonFormat = true;
break;
}
}
return hasPrintFlag && hasStreamJsonFormat;
}

class RequestedExit extends Error {
constructor(code) {
super(`process.exit ${code}`);
Expand Down Expand Up @@ -628,6 +644,7 @@ async function main() {
const hadGlobalBun = Object.prototype.hasOwnProperty.call(globalThis, 'Bun');
const originalGlobalBun = globalThis.Bun;
const asyncErrors = [];
let streamJsonWatcher = null;

globalThis.__claudeYaml = createYamlShim();
if (!globalThis.__claudeBunShim || typeof globalThis.__claudeBunShim !== 'object') {
Expand All @@ -638,7 +655,95 @@ async function main() {
asyncErrors.push(error);
}
const printWaitMs = Number(process.env.CLAUDE_TERMUX_PRINT_WAIT_MS || 5000);

function installStreamJsonTerminalWatcher() {
const hadOwnWrite = Object.prototype.hasOwnProperty.call(process.stdout, 'write');
const originalWriteDescriptor = hadOwnWrite ? Object.getOwnPropertyDescriptor(process.stdout, 'write') : undefined;
const originalWrite = process.stdout.write.bind(process.stdout);
const { StringDecoder } = require('string_decoder');
const decoder = new StringDecoder('utf8');
let lineBuffer = '';
let resultPromiseResolve = null;
let foundResult = false;
let restored = false;

process.stdout.write = function wrappedWrite(chunk, encoding, callback) {
let cb = callback;
let enc = encoding;
if (typeof encoding === 'function') {
cb = encoding;
enc = undefined;
}
const combinedCallback = (err) => {
if (!err && !foundResult) {
const chunkStr = typeof chunk === 'string'
? decoder.write(Buffer.from(chunk, typeof enc === 'string' ? enc : 'utf8'))
: decoder.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
lineBuffer += chunkStr;
const lines = lineBuffer.split('\n');
lineBuffer = lines[lines.length - 1];
for (let i = 0; i < lines.length - 1; i++) {
try {
const parsed = JSON.parse(lines[i]);
if (parsed && parsed.type === 'result') {
foundResult = true;
if (typeof resultPromiseResolve === 'function') resultPromiseResolve();
}
} catch {}
}
}
if (typeof cb === 'function') cb(err);
};
return originalWrite(chunk, enc, combinedCallback);
};

return {
waitForResult() {
if (foundResult) return Promise.resolve();
return new Promise((resolve, reject) => {
resultPromiseResolve = resolve;
});
},
restore() {
if (restored) return;
restored = true;
if (hadOwnWrite) {
Object.defineProperty(process.stdout, 'write', originalWriteDescriptor);
} else {
delete process.stdout.write;
}
},
};
}

function forceTimeoutExit(exitCode) {
try { if (streamJsonWatcher) streamJsonWatcher.restore(); } catch {}
if (extractedFile) {
try { fs.rmSync(extractedFile, { force: true }); } catch {}
}
originalExit(exitCode);
}

async function waitForPrintFlush() {
if (isStreamJsonPrintMode(argv) && streamJsonWatcher) {
let timedOut = false;
const rawResultTimeoutMs = Number(process.env.CLAUDE_TERMUX_PRINT_RESULT_TIMEOUT_MS);
const resultTimeoutMs = (Number.isFinite(rawResultTimeoutMs) && rawResultTimeoutMs > 0) ? rawResultTimeoutMs : 300000;
let timeoutHandle;
const timeoutPromise = new Promise(resolve => {
timeoutHandle = setTimeout(() => { timedOut = true; resolve(); }, resultTimeoutMs);
});
try {
await Promise.race([streamJsonWatcher.waitForResult(), timeoutPromise]);
} finally {
clearTimeout(timeoutHandle);
}
if (timedOut) {
forceTimeoutExit(1);
Comment on lines +741 to +742

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 30, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve early exits instead of waiting for a result

When a stream-json invocation calls process.exit before emitting a result event—for example during argument validation or startup failure—the RequestedExit catch still enters this wait. With the default timeout, the command hangs for five minutes and then forceTimeoutExit(1) overwrites the upstream exit status already stored in process.exitCode. Bypass the result wait for early exits or propagate the captured exit code when the timeout expires.

Useful? React with 👍 / 👎.

return;
}
return;
}
if (Number.isFinite(printWaitMs) && printWaitMs > 0) {
await new Promise(resolve => setTimeout(resolve, printWaitMs));
}
Expand Down Expand Up @@ -712,6 +817,11 @@ async function main() {
}
return originalKill.call(process, pid, signal);
};

if (isStreamJsonPrintMode(argv)) {
streamJsonWatcher = installStreamJsonTerminalWatcher();
}

const moduleLike = { exports: {} };
const maybePromise = fn(moduleLike.exports, fakeRequire, moduleLike, extractedFile, workdir);
if (maybePromise && typeof maybePromise.then === 'function') await maybePromise;
Expand All @@ -735,6 +845,9 @@ async function main() {
process.argv = originalArgv;
process.exit = originalExit;
process.kill = originalKill;
if (streamJsonWatcher) {
try { streamJsonWatcher.restore(); } catch {}
}
try {
if (originalBun === undefined) {
delete process.versions.bun;
Expand Down Expand Up @@ -786,6 +899,22 @@ const entryJsOffset = Number(process.env.ENTRY_JS_OFFSET);
const entryEndOffset = Number(process.env.ENTRY_END_OFFSET);
const argv = process.argv.slice(2);

function isStreamJsonPrintMode(argv) {
const dashDashIndex = argv.indexOf('--');
const ownArgs = dashDashIndex === -1 ? argv : argv.slice(0, dashDashIndex);
const hasPrintFlag = ownArgs.includes('-p') || ownArgs.includes('--print');
let hasStreamJsonFormat = false;
for (let i = 0; i < ownArgs.length; i++) {
const tok = ownArgs[i];
if (tok === '--output-format=stream-json') { hasStreamJsonFormat = true; break; }
if (tok === '--output-format' && ownArgs[i + 1] === 'stream-json') {
hasStreamJsonFormat = true;
break;
}
}
return hasPrintFlag && hasStreamJsonFormat;
}

class RequestedExit extends Error {
constructor(code) {
super(`process.exit ${code}`);
Expand Down Expand Up @@ -1335,6 +1464,7 @@ async function main() {
const hadGlobalBun = Object.prototype.hasOwnProperty.call(globalThis, 'Bun');
const originalGlobalBun = globalThis.Bun;
const asyncErrors = [];
let streamJsonWatcher = null;

globalThis.__claudeYaml = createYamlShim();
if (!globalThis.__claudeBunShim || typeof globalThis.__claudeBunShim !== 'object') {
Expand All @@ -1344,8 +1474,96 @@ async function main() {
function onAsyncError(error) {
asyncErrors.push(error);
}

function installStreamJsonTerminalWatcher() {
const hadOwnWrite = Object.prototype.hasOwnProperty.call(process.stdout, 'write');
const originalWriteDescriptor = hadOwnWrite ? Object.getOwnPropertyDescriptor(process.stdout, 'write') : undefined;
const originalWrite = process.stdout.write.bind(process.stdout);
const { StringDecoder } = require('string_decoder');
const decoder = new StringDecoder('utf8');
let lineBuffer = '';
let resultPromiseResolve = null;
let foundResult = false;
let restored = false;

process.stdout.write = function wrappedWrite(chunk, encoding, callback) {
let cb = callback;
let enc = encoding;
if (typeof encoding === 'function') {
cb = encoding;
enc = undefined;
}
const combinedCallback = (err) => {
if (!err && !foundResult) {
const chunkStr = typeof chunk === 'string'
? decoder.write(Buffer.from(chunk, typeof enc === 'string' ? enc : 'utf8'))
: decoder.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
lineBuffer += chunkStr;
const lines = lineBuffer.split('\n');
lineBuffer = lines[lines.length - 1];
for (let i = 0; i < lines.length - 1; i++) {
try {
const parsed = JSON.parse(lines[i]);
if (parsed && parsed.type === 'result') {
foundResult = true;
if (typeof resultPromiseResolve === 'function') resultPromiseResolve();
}
} catch {}
}
}
if (typeof cb === 'function') cb(err);
};
return originalWrite(chunk, enc, combinedCallback);
};

return {
waitForResult() {
if (foundResult) return Promise.resolve();
return new Promise((resolve, reject) => {
resultPromiseResolve = resolve;
});
},
restore() {
if (restored) return;
restored = true;
if (hadOwnWrite) {
Object.defineProperty(process.stdout, 'write', originalWriteDescriptor);
} else {
delete process.stdout.write;
}
},
};
}

function forceTimeoutExit(exitCode) {
try { if (streamJsonWatcher) streamJsonWatcher.restore(); } catch {}
if (extractedFile) {
try { fs.rmSync(extractedFile, { force: true }); } catch {}
}
originalExit(exitCode);
}

async function waitForPrintFlushIfNeeded() {
if (process.env.CLAUDE_TERMUX_PRINT_MODE !== '1') return;
if (isStreamJsonPrintMode(argv) && streamJsonWatcher) {
let timedOut = false;
const rawResultTimeoutMs = Number(process.env.CLAUDE_TERMUX_PRINT_RESULT_TIMEOUT_MS);
const resultTimeoutMs = (Number.isFinite(rawResultTimeoutMs) && rawResultTimeoutMs > 0) ? rawResultTimeoutMs : 300000;
let timeoutHandle;
const timeoutPromise = new Promise(resolve => {
timeoutHandle = setTimeout(() => { timedOut = true; resolve(); }, resultTimeoutMs);
});
try {
await Promise.race([streamJsonWatcher.waitForResult(), timeoutPromise]);
} finally {
clearTimeout(timeoutHandle);
}
if (timedOut) {
forceTimeoutExit(1);
return;
}
return;
}
const printWaitMs = Number(process.env.CLAUDE_TERMUX_PRINT_WAIT_MS || 5000);
if (Number.isFinite(printWaitMs) && printWaitMs > 0) {
await new Promise(resolve => setTimeout(resolve, printWaitMs));
Expand Down Expand Up @@ -1421,6 +1639,10 @@ async function main() {
return originalKill.call(process, pid, signal);
};

if (isStreamJsonPrintMode(argv)) {
streamJsonWatcher = installStreamJsonTerminalWatcher();
}

const moduleLike = { exports: {} };
const maybePromise = fn(moduleLike.exports, fakeRequire, moduleLike, extractedFile, workdir);
if (maybePromise && typeof maybePromise.then === 'function') await maybePromise;
Expand All @@ -1439,6 +1661,9 @@ async function main() {
process.argv = originalArgv;
process.exit = originalExit;
process.kill = originalKill;
if (streamJsonWatcher) {
try { streamJsonWatcher.restore(); } catch {}
}
process.once('exit', () => {
if (extractedFile) {
try {
Expand Down
Loading