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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const rowSchema = z.object({request_id: z.string(), goal_id: z.string(), agent_i
control_state: z.string().nullable(),
brief: requestBriefSchema.nullable().optional(), source_question: z.string(), request_revision: z.number().int().positive().nullable(),
read_status: z.string(), decision: z.string(), decision_reason: z.string().nullable().optional(),
returns: z.array(z.object({phase: z.string(), status: z.string(), request_revision: z.number().nullable().optional()})),
returns: z.array(z.object({phase: z.string(), status: z.string(), request_revision: z.number().nullable().optional(),
error: z.string().nullable().optional()})),
linked_todos: z.array(z.object({todo_id: z.string(), title: z.string().nullable().optional(), status: z.string().optional()})),
evidence_refs: z.array(z.string()), warnings: z.array(z.string()),
source_session_id: z.string(), source_turn_id: z.string(), last_event_at: z.string().nullable()});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,18 @@ export function OriginalProjectRequests({sessionId, refreshKey}: {sessionId: str
</div>;
}

function returnNeedsVerification(row: ConversationRequest) {
return row.agenda?.step === "recover_evidence"
&& row.returns.some(delivery => delivery.phase === "conclusion" && delivery.error === "manager_return_payload_conflict");
}

function requestStage(row: ConversationRequest, zh: boolean) {
if (!row.unfinished) return row.control_state === "cancelled" ? (zh ? "已取消" : "Cancelled")
: (zh ? "已回传" : "Returned");
switch (row.agenda?.step) {
case "recover_evidence": return zh ? "待恢复" : "Readback unavailable";
case "recover_evidence": return returnNeedsVerification(row)
? (zh ? "回传待核对" : "Return needs verification")
: (zh ? "待恢复" : "Readback unavailable");
case "reconcile_reservation": return zh ? "取消待收尾" : "Cancellation settling";
case "await_return_delivery": return zh ? "待送达" : "Awaiting delivery";
case "consume_peer_result": case "await_peer_consumption": return zh ? "结果待核对" : "Result awaiting readback";
Expand Down Expand Up @@ -182,7 +189,9 @@ function OriginalRequest({row, zh, revision, active}: {row: ConversationRequest;
}).catch(() => {if (!abort.signal.aborted) {setMessages(null); setError(true);}});
return () => abort.abort();
}, [open, active, row.source_session_id, row.source_turn_id, revision]);
return <details onToggle={event => {focusOnRead.current = event.currentTarget.open; setOpen(event.currentTarget.open);}}><summary>{zh ? "原对话" : "Original conversation"}</summary>
return <details onToggle={event => {focusOnRead.current = event.currentTarget.open; setOpen(event.currentTarget.open);}}><summary>{returnNeedsVerification(row)
? (zh ? "核对原对话" : "Check original conversation")
: (zh ? "原对话" : "Original conversation")}</summary>
<div ref={content} tabIndex={-1}>{error ? <p role="alert">{zh ? "原对话暂时无法读取,请重新打开重试。" : "Original conversation unavailable. Reopen to retry."}</p>
: messages ? messages.map(message => <article key={message.message_id}>
<strong>{message.role === "user" ? (zh ? "你" : "You") : "LoopX"}</strong><MarkdownText text={message.reply_context?.source_text ?? message.text}/>
Expand Down
12 changes: 11 additions & 1 deletion loopx/capabilities/manager_context/roundtrip.py
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ def _return_transaction(host, path, phase, request):
"exact": exact, "facts": observed, **payload,
}, retry_safe=False)
if (not isinstance(result, dict) or result.get("schema_version") != RETURN_DELIVERY_TRANSACTION
or result.get("action") not in {"skip", "private", "verify", "send"}
or result.get("action") not in {"skip", "private", "verify", "send", "reconcile_private"}
or type(result.get("processed")) is not int or result["processed"] not in {0, 1}):
raise RuntimeError("return delivery transaction result shape mismatch")
return result
Expand Down Expand Up @@ -753,6 +753,16 @@ def transact(phase, **payload):
return _return_transaction(host, path, phase,
{"facts": current, **checkpoint, **payload})

if plan["action"] == "reconcile_private":
try:
original = store.read_history_message(source["route"]["session_id"], plan["message_id"])
except (OSError, ValueError, KeyError):
return 0
if cancelled():
return 0
recovered = transact("settle", private_readback=original)
return recovered["processed"]

def record_attempt(attempt):
saved = transact("attempt", attempt=dict(attempt))
checkpoint.update({key: saved[key] for key in ("revision", "token")})
Expand Down
14 changes: 11 additions & 3 deletions loopx/capabilities/manager_context/tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
_receipt as _receipt,
record_read as record_read,
controlled_request_readback,
read_inbox_transaction,
)
from ...control_plane.collaboration.goal_instance_scope import (
CollaborationGoalScope,
Expand Down Expand Up @@ -228,7 +229,15 @@ def _legacy_channels() -> dict[Any, set[Any]]:
)
projected, todos_cache = [], {}
core_read_goals = set(evidence_goal_scope(root, channel_id, registry_path=registry_path) or []) if not owner_scope else set()
for row in rows[offset : offset + limit]:
page = rows[offset : offset + limit]
returns = []
if page:
returns = read_inbox_transaction(root, {
"operation": "receipt_states",
"rows": [{"request_id": row["request_id"], "source_kind": row.get("source_kind")} for row in page],
"return_statuses_only": True,
})["return_items"]
for row, return_statuses in zip(page, returns, strict=True):
read, read_error = _receipt(root, "reads", row)
decision, decision_error = _receipt(root, "decisions", row)
work = read_linked_work(root, registry_path, row, todos_cache,
Expand Down Expand Up @@ -262,8 +271,7 @@ def _legacy_channels() -> dict[Any, set[Any]]:
evidence_verification="receiver_linked_reference_not_independent_verification",
warnings=warnings,
)
from .roundtrip import reply_status
item["return_replies"] = reply_status(root, row)
item["return_replies"] = return_statuses
if owner_scope:
item["decision"]["reason"] = decision.get("reason")
else:
Expand Down
7 changes: 3 additions & 4 deletions loopx/control_plane/collaboration/conversation_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from ..content_digest import BARE_SHA256_PATTERN
from .goal_instance_scope import collaboration_goal_scope, inspect_original_request_batch
from .inbox import _entry, _now, _read, _receipt, _request_lock, _root, read_inbox_transaction, reply_status
from .inbox import _entry, _now, _read, _receipt, _request_lock, _root, read_inbox_transaction
from .links import read_linked_work
from .source_chat_observation import is_source_chat_host, original_delivery_facts, original_turn_reader
from .source_grant_observation import source_context_target_authority
Expand Down Expand Up @@ -58,7 +58,7 @@ def _read_receipt_batch(root, rows):
return []
try:
observed = read_inbox_transaction(root, {"operation": "receipt_states", "rows": rows, "include_agenda": True})
states = list(zip(observed["items"], observed["agenda_items"], strict=True))
states = list(zip(observed["items"], observed["agenda_items"], observed["return_items"], strict=True))
if len(states) != len(rows):
raise ValueError("Inbox receipt count does not match requests")
return states
Expand Down Expand Up @@ -217,11 +217,10 @@ def read_conversation_requests(root, registry, store, session, *, goal_ids, core
failed += 1
continue
try:
state, agenda = observed
state, agenda, replies = observed
controlled = state.get("readback")
read, read_error = _receipt(root, "reads", row)
decision, decision_error = _receipt(root, "decisions", row)
replies = reply_status(root, row)
work_reads.append((row, source_session_id, source_turn, state, agenda, controlled,
read, read_error, decision, decision_error, replies))
except (OSError, ValueError, KeyError, TypeError):
Expand Down
4 changes: 3 additions & 1 deletion loopx/control_plane/collaboration/inbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ def read_inbox_transaction(root: Path, request: dict, *, scope=None) -> dict:
) if key in item} for item in request["items"]]
# Full source pages may exceed the ordinary wire even when every record is legal.
snapshot = request["operation"] in {"pending", "turn_start", "receiver_read", "returns"}
snapshot = snapshot or len(request.get("rows", [])) > 1 or request.get("include_agenda") is True
snapshot = snapshot or len(request.get("rows", [])) > 1 or any(
request.get(option) is True for option in ("include_agenda", "return_statuses_only")
)
try:
result = effect_runtime_result("collaboration.inbox.read", facts, large_local_snapshot=snapshot)
except EffectRuntimeRejected as exc:
Expand Down
44 changes: 36 additions & 8 deletions loopx/control_plane/collaboration/inbox_read.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {decideCollaborationLifecycle} from "./goal_instance_lifecycle.ts";
import {inspectCollaborationInboxReceipts, projectReceiverFollowthrough} from "./inbox_receipts.ts";
import {recordControlledRequestRead} from "./request_control.ts";
import {planCollaborationResult} from "./result_publication.ts";
import {confirmedTerminalReturn, terminalReturnIdentityConflict, TERMINAL_RETURN_READBACK_SUFFIX} from "./terminal_return_readback.ts";
import {CONVERSATION_ENTRY_SCHEMA, normalizeOriginalConversationRecipient, verifyOriginalConversationReturnRoute} from "./semantic_request.ts";
import {projectDelegationTurnContext, projectDelegationTurnItem, projectDelegationTurnItems} from "./turn_context.ts";
import {isNativeChildResultCursor, nativeChildResultInbox} from "../capabilities/native_child_result_inbox.ts";
Expand Down Expand Up @@ -362,22 +363,38 @@ function replyStatuses(root: string, row: JsonObject): JsonObject[] {
|| error !== null && (typeof error !== "string" || !DELIVERY_ERRORS.has(error))) {
status = "explicit_unverified"; error = "delivery_state_unreadable";
}
if (status === "delivered" && row.source_kind !== "peer"
&& terminalReturnIdentityConflict(state, requestId(row.request_id), key)) {
let deliveredAt: string | null = null;
try {
const readback = observe(join(folder, key + TERMINAL_RETURN_READBACK_SUFFIX));
if (readback.state === "read") {
const route = readRecord(join(root, "roundtrips", requestId(row.request_id) + ".json"));
deliveredAt = confirmedTerminalReturn(readback.value as JsonObject, state, reply, route);
}
} catch (failure) { if (!recordFailure(failure)) throw failure; }
return {...identity, status: deliveredAt === null ? "explicit_unverified" : "delivered",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

[P2] CLI 详情在原会话回执核对前显示已送达。四组 File/SQLite 对照中,App 和 CLI 待办仍显示回传待核对时,manager-inbox status 已报告 delivered。 当前详情读取。让详情在完成原有作用域检查后读取和 App、CLI 待办相同的 TypeScript 回执投影,并给三个正常入口加入同一组核对前后断言。

created_at: reply.created_at ?? null, delivered_at: deliveredAt,
error: deliveredAt === null ? "manager_return_payload_conflict" : null};
}
return {...identity, status, created_at: reply.created_at ?? null,
delivered_at: typeof state.delivered_at === "string" && [...state.delivered_at].length <= 80 ? state.delivered_at : null,
error, ...(state.verification === "reconciled_after_restart" ? {verification: state.verification} : {})};
});
}
function agendaResults(root: string, row: JsonObject): JsonObject[] {
function agendaResults(root: string, row: JsonObject, returns = replyStatuses(root, row)): JsonObject[] {
const folder = join(root, "replies", requestId(row.request_id));
const statuses = new Map(replyStatuses(root, row).map(status => [status.result_key ?? status.phase, status.status]));
const statuses = new Map(returns.map(status => [status.result_key ?? status.phase, status]));
const replies = resultKeys(folder).map(key => ({key, reply: readRecord(join(folder, key + ".json"))}));
// Reuse immutable request-local observations; each result still goes through
// the publication validator and its current delivery/consumption readback.
const observations = replies.map(({key, reply}) => resultObservation(key, reply));
return replies.flatMap(({key, reply}) => {
if (reply.phase !== "conclusion") return [];
if (!inspectResult(root, row, key, reply, observations)) fail("delegation result identity unavailable");
return [{result_key: key, request_revision: reply.request_revision ?? 1, status: statuses.get(key),
const delivery = statuses.get(key);
return [{result_key: key, request_revision: reply.request_revision ?? 1, status: delivery?.status,
...(delivery?.error === "manager_return_payload_conflict" ? {error: delivery.error} : {}),
consumed: row.source_kind === "peer" && returnConsumed(root, key, row, reply, row.source_agent_id)}];
});
}
Expand Down Expand Up @@ -543,17 +560,28 @@ export async function readCollaborationInbox(params: JsonObject): Promise<JsonOb
if (operation === "receipt_states") {
if (!Array.isArray(params.rows) || params.rows.length > 128) fail("bounded inbox requests are required");
const rows = params.rows.map(row => requireJsonObject(row, "inbox request"));
if (params.return_statuses_only === true) {
return {return_items: rows.map(row => replyStatuses(root, row))};
}
const items = rows.map(row => receiptState(root, row));
if (params.include_agenda !== true) return {items};
return {items, agenda_items: rows.map((request, index) => {
const returnItems: JsonObject[][] = [];
const agendaItems = rows.map((request, index) => {
const links = linksReceipt(root, request);
let results: JsonObject[] = [], unavailable = links.unavailable;
try { results = agendaResults(root, request); }
catch (error) { if (!recordFailure(error)) throw error; unavailable = true; }
let returns: JsonObject[] = [], results: JsonObject[] = [], unavailable = links.unavailable;
try {
returns = replyStatuses(root, request);
results = agendaResults(root, request, returns);
} catch (error) {
if (!recordFailure(error)) throw error;
unavailable = true;
}
returnItems.push(returns);
return projectDelegationTurnItem({direction: "outgoing", request: {...request,
purpose: jsonObject(request.brief)?.purpose ?? ""}, receipt: items[index],
todo_ids: links.value.todo_ids ?? [], evidence_unavailable: unavailable, results});
})};
});
return {items, agenda_items: agendaItems, return_items: returnItems};
}
const scope = requireJsonObject(params.scope, "Goal scope");
const conversation = scope.profile_id === "original_conversation_v0";
Expand Down
15 changes: 15 additions & 0 deletions loopx/control_plane/collaboration/result_publication.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ function decisionKey(revision: number): string {
}
const UPDATE_ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,119}$/;

export function returnMessageId(requestId: string, resultKey: string): string {
// Retain Python json.dumps' spaces in the existing ASCII-only message identity.
const identity = JSON.stringify([requestId, resultKey]).replace(",", ", ");
return "handoff." + createHash("sha256").update(identity).digest("hex");
}

/** Receiver-authored scope on an immutable result, not a completion verdict or scheduler. */
export function resultRemainingWork(value: unknown): JsonObject | null {
if (value === undefined || value === null) return null;
Expand Down Expand Up @@ -64,6 +70,15 @@ export function resultAttachmentRefs(params: JsonObject): JsonObject {
return {refs};
}

/** Match the exact bytes normal publication writes to the original Chat. */
export function returnTranscriptText(reply: JsonObject, exact: boolean): string {
const prefix = exact ? (reply.phase === "conclusion" ? "处理结论" : "处理进展")
: (reply.phase === "conclusion" ? "协作回复" : "协作进展");
const provenance = `${prefix} · ${reply.agent_id} · 委托 ${String(reply.request_id).slice(0, 8)}`;
const body = collaborationResultText(reply);
return usesReaderReturnFormat(reply) ? `${body}\n\n${provenance}` : `${provenance}\n\n${body}`;
}

/** Explicit result files are content-bound observations, never new grants. */
export function resultAttachments(value: unknown): JsonObject[] {
if (value === undefined || value === null) return [];
Expand Down
Loading
Loading