mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-20 13:09:33 +01:00
fix(mobile): Send on Enter fourth review fixes
- selectSession restores the CJK draft after _activateFileBrowserSession, which test/file-browser-search.test.ts pins right after the activeSessionId assignment. - A lone digit while the session has a pending permission_prompt or elicitation_dialog goes out without the delayed Enter: the dialog acts on the digit, and the Enter would confirm whatever comes next. Same rule as the Approvals Inbox and the Discord bridge. - Changeset mentions the toolbar Enter sending the CJK field. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
80d719df5f
commit
b5ad7afebe
6 files changed
+79
-6
No files matched your search
@@ -2,4 +2,4 @@
|
|||||||
"aicodeman": patch
|
"aicodeman": patch
|
||||||
---
|
---
|
||||||
|
|
||||||
Add a per-device "Send on Enter" mode for the pinned CJK input field, so phone users can scroll the terminal while a typed answer waits in the field until Enter.
|
Add a per-device "Send on Enter" mode for the pinned CJK input field, so phone users can scroll the terminal while a typed answer waits in the field until Enter. The phone toolbar's Enter button now also sends the CJK field's text while the field is visible, in live mode too.
|
||||||
@@ -72,7 +72,9 @@ typed text stays in it until Enter, so you can scroll the terminal back to a que
|
|||||||
your answer before sending. Shift+Enter adds a line, Esc clears the field, and autocorrect is on.
|
your answer before sending. Shift+Enter adds a line, Esc clears the field, and autocorrect is on.
|
||||||
Enter always goes out as its own write, a moment after the text, to the session the answer was
|
Enter always goes out as its own write, a moment after the text, to the session the answer was
|
||||||
typed for: a single character is typed, so CLI menus that take a digit still work, and anything
|
typed for: a single character is typed, so CLI menus that take a digit still work, and anything
|
||||||
longer goes like the prompt composer's Send, as one paste. The toolbar's Enter button sends the
|
longer goes like the prompt composer's Send, as one paste. The one exception is a lone digit while
|
||||||
|
a permission or question dialog is waiting: the digit answers the dialog by itself, so no Enter
|
||||||
|
follows it, which would otherwise confirm whatever the CLI shows next. The toolbar's Enter button sends the
|
||||||
field too. With the keyboard bar's one-shot Ctrl armed, the next key you type goes out as a control
|
field too. With the keyboard bar's one-shot Ctrl armed, the next key you type goes out as a control
|
||||||
key (Ctrl, then `c` is Ctrl+C) instead of being held. With the keyboard down the field stays one
|
key (Ctrl, then `c` is Ctrl+C) instead of being held. With the keyboard down the field stays one
|
||||||
line tall. A draft stays with its session: switching tabs and coming back brings it back.
|
line tall. A draft stays with its session: switching tabs and coming back brings it back.
|
||||||
|
|||||||
@@ -10047,8 +10047,8 @@ class CodemanApp {
|
|||||||
|
|
||||||
this._cleanupPreviousSession(sessionId, { keepCjkDraft: reloadingSameSession });
|
this._cleanupPreviousSession(sessionId, { keepCjkDraft: reloadingSameSession });
|
||||||
this.activeSessionId = sessionId;
|
this.activeSessionId = sessionId;
|
||||||
if (typeof CjkInput !== 'undefined') CjkInput.restoreDraft?.(sessionId);
|
|
||||||
this._activateFileBrowserSession?.(sessionId);
|
this._activateFileBrowserSession?.(sessionId);
|
||||||
|
if (typeof CjkInput !== 'undefined') CjkInput.restoreDraft?.(sessionId);
|
||||||
// A keyboard row hold belongs to the session it was taken for: release it here
|
// A keyboard row hold belongs to the session it was taken for: release it here
|
||||||
// if this one resizes instead (the geometry work below then fits it).
|
// if this one resizes instead (the geometry work below then fits it).
|
||||||
this._reconcileKeyboardHold?.({ resize: false });
|
this._reconcileKeyboardHold?.({ resize: false });
|
||||||
|
|||||||
@@ -4577,8 +4577,13 @@ Object.assign(CodemanApp.prototype, {
|
|||||||
* single character is typed (a selection dialog ignores a pasted `3`, then
|
* single character is typed (a selection dialog ignores a pasted `3`, then
|
||||||
* Enter confirms the highlighted option), anything else goes through the
|
* Enter confirms the highlighted option), anything else goes through the
|
||||||
* composer's path as one bracketed paste. The session is captured now, so the
|
* composer's path as one bracketed paste. The session is captured now, so the
|
||||||
* delayed Enter cannot follow a tab switch. Returns false when nothing was
|
* delayed Enter cannot follow a tab switch. A lone digit while the session
|
||||||
* sent (no session, too long), so the field keeps the text.
|
* shows a permission or question dialog goes out without the Enter: the
|
||||||
|
* dialog acts on the digit itself, and a later Enter would confirm whatever
|
||||||
|
* the CLI shows next (a second permission prompt, unseen). Same rule as the
|
||||||
|
* Approvals Inbox and the Discord bridge (server.ts awaitingChoice). Returns
|
||||||
|
* false when nothing was sent (no session, too long), so the field keeps the
|
||||||
|
* text.
|
||||||
*/
|
*/
|
||||||
_sendCjkPrompt(text) {
|
_sendCjkPrompt(text) {
|
||||||
const sessionId = this.activeSessionId;
|
const sessionId = this.activeSessionId;
|
||||||
@@ -4594,6 +4599,12 @@ Object.assign(CodemanApp.prototype, {
|
|||||||
if ([...text].length === 1) {
|
if ([...text].length === 1) {
|
||||||
if (this._localEchoPolicy === 'predict') this._predictiveEcho?.clearPredictions();
|
if (this._localEchoPolicy === 'predict') this._predictiveEcho?.clearPredictions();
|
||||||
this._sendInputAsync(sessionId, text);
|
this._sendInputAsync(sessionId, text);
|
||||||
|
const hooks = this.pendingHooks?.get(sessionId);
|
||||||
|
const awaitingChoice = !!hooks && (hooks.has('permission_prompt') || hooks.has('elicitation_dialog'));
|
||||||
|
if (/^\d$/.test(text) && awaitingChoice) {
|
||||||
|
_crashDiag.log(`CJK prompt digit answers a dialog, no Enter`);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
setTimeout(() => this._sendInputAsync(sessionId, '\r', { useMux: true }), 120);
|
setTimeout(() => this._sendInputAsync(sessionId, '\r', { useMux: true }), 120);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,8 +107,10 @@ describe('a held draft survives a reload of the same session', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('selectSession restores the draft of the session it lands on', () => {
|
it('selectSession restores the draft of the session it lands on', () => {
|
||||||
|
// After _activateFileBrowserSession: test/file-browser-search.test.ts pins
|
||||||
|
// that call as the line right after the activeSessionId assignment.
|
||||||
expect(read('app.js')).toContain(
|
expect(read('app.js')).toContain(
|
||||||
"this.activeSessionId = sessionId;\n if (typeof CjkInput !== 'undefined') CjkInput.restoreDraft?.(sessionId);"
|
"this.activeSessionId = sessionId;\n this._activateFileBrowserSession?.(sessionId);\n if (typeof CjkInput !== 'undefined') CjkInput.restoreDraft?.(sessionId);"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -606,6 +606,64 @@ describe('Send on Enter: a held answer goes out with Enter as its own write', ()
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('sends a lone digit without Enter while a permission or question dialog waits', () => {
|
||||||
|
// The dialog acts on the digit keypress itself; an Enter 120 ms later would
|
||||||
|
// confirm whatever the CLI shows next (a second permission prompt, unseen).
|
||||||
|
// Same rule as the Approvals Inbox and the Discord bridge (awaitingChoice).
|
||||||
|
vi.useFakeTimers();
|
||||||
|
try {
|
||||||
|
for (const hook of ['permission_prompt', 'elicitation_dialog']) {
|
||||||
|
const { app, composed } = promptApp();
|
||||||
|
const writes: Array<[string, string, unknown]> = [];
|
||||||
|
(app as unknown as { _sendInputAsync: unknown })._sendInputAsync = (
|
||||||
|
id: string,
|
||||||
|
input: string,
|
||||||
|
opts?: unknown
|
||||||
|
) => writes.push([id, input, opts]);
|
||||||
|
(app as unknown as { pendingHooks: Map<string, Set<string>> }).pendingHooks = new Map([
|
||||||
|
['session-a', new Set([hook])],
|
||||||
|
]);
|
||||||
|
expect(app._sendCjkPrompt('2')).toBe(true);
|
||||||
|
vi.advanceTimersByTime(500);
|
||||||
|
expect(writes).toEqual([['session-a', '2', undefined]]);
|
||||||
|
composed.mockRestore();
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
vi.useRealTimers();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the delayed Enter for a digit when only an idle prompt is pending, or for a letter in a dialog', () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
try {
|
||||||
|
const cases: Array<[string, string]> = [
|
||||||
|
['idle_prompt', '1'],
|
||||||
|
['permission_prompt', 'y'],
|
||||||
|
];
|
||||||
|
for (const [hook, text] of cases) {
|
||||||
|
const { app, composed } = promptApp();
|
||||||
|
const writes: Array<[string, string, unknown]> = [];
|
||||||
|
(app as unknown as { _sendInputAsync: unknown })._sendInputAsync = (
|
||||||
|
id: string,
|
||||||
|
input: string,
|
||||||
|
opts?: unknown
|
||||||
|
) => writes.push([id, input, opts]);
|
||||||
|
(app as unknown as { pendingHooks: Map<string, Set<string>> }).pendingHooks = new Map([
|
||||||
|
['session-a', new Set([hook])],
|
||||||
|
]);
|
||||||
|
expect(app._sendCjkPrompt(text)).toBe(true);
|
||||||
|
vi.advanceTimersByTime(120);
|
||||||
|
expect(writes).toEqual([
|
||||||
|
['session-a', text, undefined],
|
||||||
|
['session-a', '\r', { useMux: true }],
|
||||||
|
]);
|
||||||
|
composed.mockRestore();
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
vi.useRealTimers();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it('pastes even a short word: only one character is typed', () => {
|
it('pastes even a short word: only one character is typed', () => {
|
||||||
const { app, composed } = promptApp();
|
const { app, composed } = promptApp();
|
||||||
expect(app._sendCjkPrompt('yes')).toBe(true);
|
expect(app._sendCjkPrompt('yes')).toBe(true);
|
||||||
|
|||||||
Reference in new issue
Block a user