Skip to content

Commit cf2b1a2

Browse files
thymikeeclaude
andcommitted
refactor(fill): host the read-back redaction beside the fill payload redaction
The new daemon module grew the eager closure of the daemon entries by one module. Move the helpers into parameterized-recorded-fill, which both callers already load. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
1 parent 53e5b49 commit cf2b1a2

4 files changed

Lines changed: 100 additions & 98 deletions

File tree

‎packages/daemon/src/core/fill-read-back-redaction.ts‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎packages/daemon/src/execution/interaction/internal/interaction-common.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import {
1313
isSensitiveFillText,
1414
sensitiveFillPlaceholder,
1515
} from '@agent-device/ad-script';
16-
import { parameterizeRecordedFillPayload } from '@agent-device/selectors/parameterized-recorded-fill';
17-
import { redactFillReadBack } from '../../../core/fill-read-back-redaction.ts';
16+
import {
17+
parameterizeRecordedFillPayload,
18+
redactFillReadBack,
19+
} from '@agent-device/selectors/parameterized-recorded-fill';
1820
import type { InteractionFinalizationOperations } from '../../../core/interaction/internal/types.ts';
1921

2022
export function finalizeTouchInteraction(params: {

‎packages/daemon/src/server/request-router.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import type {
3434
import type { DaemonInvokeFn, DaemonRequest } from '../core/daemon-request.ts';
3535
import { RESPONSE_VIEWS } from './response-views.ts';
3636
import { SessionStore } from '../core/session-store.ts';
37-
import { redactFillFailureReadBack } from '../core/fill-read-back-redaction.ts';
3837
import { resolvePlatformProviderRequestContext } from './request-platform-provider-context.ts';
3938
import {
4039
countDiagnosticEventsByPhase,
@@ -69,7 +68,10 @@ import {
6968
sensitiveFillPlaceholder,
7069
} from '@agent-device/ad-script';
7170
import { createPlatformRequestScope } from './platform-request-scope.ts';
72-
import { parameterizeSensitiveString } from '@agent-device/selectors/parameterized-recorded-fill';
71+
import {
72+
parameterizeSensitiveString,
73+
redactFillFailureReadBack,
74+
} from '@agent-device/selectors/parameterized-recorded-fill';
7375
import { isConfinedToAppLease, scopeRequestSession } from '../sessions/request-admission.ts';
7476
import { redactMacOsAppLeaseResponse } from '../resources/macos-app-lease.ts';
7577
import { resolveEffectiveSessionName } from '../sessions/session-routing.ts';

‎packages/selectors/src/parameterized-recorded-fill.ts‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,3 +522,95 @@ function isStringArray(value: unknown): value is string[] {
522522
function readStringArray(value: unknown): string[] | undefined {
523523
return isStringArray(value) ? value : undefined;
524524
}
525+
526+
// A sensitive fill's literal is redacted by exact match, but a backend also reads the field back,
527+
// and the field may hold a reformatted or partly dropped form of it. The owner that knows the fill
528+
// is sensitive replaces every read-back value outright instead of matching altered forms.
529+
type ReadBackRecord = Record<string, unknown>;
530+
531+
/** The fields `FillUnconfirmedVerification` carries as text. A null read-back reveals nothing. */
532+
const UNCONFIRMED_READ_BACK_FIELDS = ['requested', 'before', 'after'] as const;
533+
534+
/** The text fields of an Android fill failure's `details`, and of its two observed input nodes. */
535+
const FAILURE_READ_BACK_FIELDS = ['expected', 'actual'] as const;
536+
const FAILURE_INPUT_NODE_FIELDS = ['targetInput', 'actualInput'] as const;
537+
538+
/**
539+
* Replaces the text a sensitive fill's response read back from the field: the unconfirmed
540+
* evidence, and the diff lines and tail labels of a `--settle` observation. Refs, counts and
541+
* summaries stay. This runs before literal parameterization, so a short literal cannot rewrite
542+
* the `verification` discriminator this checks.
543+
*/
544+
export function redactFillReadBack<TPayload extends ReadBackRecord | undefined>(
545+
payload: TPayload,
546+
placeholder: string,
547+
): TPayload {
548+
if (!payload) return payload;
549+
const unconfirmed =
550+
payload.verification === 'unconfirmed'
551+
? placeholderFields(payload, UNCONFIRMED_READ_BACK_FIELDS, placeholder)
552+
: {};
553+
return {
554+
...payload,
555+
...unconfirmed,
556+
...(isRecord(payload.settle)
557+
? { settle: redactSettleReadBack(payload.settle, placeholder) }
558+
: {}),
559+
};
560+
}
561+
562+
function redactSettleReadBack(settle: ReadBackRecord, placeholder: string): ReadBackRecord {
563+
const { diff, tail } = settle;
564+
return {
565+
...settle,
566+
...(isRecord(diff) && Array.isArray(diff.lines)
567+
? {
568+
diff: {
569+
...diff,
570+
lines: diff.lines.map((line) => redactTextField(line, 'text', placeholder)),
571+
},
572+
}
573+
: {}),
574+
...(Array.isArray(tail)
575+
? { tail: tail.map((entry) => redactTextField(entry, 'label', placeholder)) }
576+
: {}),
577+
};
578+
}
579+
580+
function redactTextField(entry: unknown, field: string, placeholder: string): unknown {
581+
return isRecord(entry) ? { ...entry, ...placeholderFields(entry, [field], placeholder) } : entry;
582+
}
583+
584+
/** A backend fill failure is typed by `failureReason`; only that shape carries read-back text. */
585+
export function redactFillFailureReadBack(details: unknown, placeholder: string): unknown {
586+
if (!isRecord(details) || typeof details.failureReason !== 'string') return details;
587+
const nodes = Object.fromEntries(
588+
FAILURE_INPUT_NODE_FIELDS.flatMap((field) => {
589+
const node = details[field];
590+
return isRecord(node)
591+
? [[field, { ...node, ...placeholderFields(node, ['text'], placeholder) }]]
592+
: [];
593+
}),
594+
);
595+
return {
596+
...details,
597+
...placeholderFields(details, FAILURE_READ_BACK_FIELDS, placeholder),
598+
...nodes,
599+
};
600+
}
601+
602+
function placeholderFields(
603+
record: ReadBackRecord,
604+
fields: readonly string[],
605+
placeholder: string,
606+
): ReadBackRecord {
607+
return Object.fromEntries(
608+
fields
609+
.filter((field) => typeof record[field] === 'string')
610+
.map((field) => [field, placeholder]),
611+
);
612+
}
613+
614+
function isRecord(value: unknown): value is ReadBackRecord {
615+
return typeof value === 'object' && value !== null && !Array.isArray(value);
616+
}

0 commit comments

Comments
 (0)