From 3becc6c1906a4c81d5602e351110e0a966d08b0f Mon Sep 17 00:00:00 2001 From: Sam & Claude Date: Sat, 27 Jun 2026 21:30:08 +0200 Subject: [PATCH] fix: resolve merge conflict markers in mcp-ssh + schema (PR #240 merge artifact) Two files had unresolved <<<<<<< HEAD / >>>>>>> markers committed to main: - colibri-mcp-ssh: resolved to JSON proof_text example + screenshot_uuid - mother_schema.sql: resolved to both columns (proof_text + screenshot_uuid) --- packaging/mother/colibri-mcp-ssh | 6 +----- packaging/mother/mother_schema.sql | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/packaging/mother/colibri-mcp-ssh b/packaging/mother/colibri-mcp-ssh index a7f0c89..029e429 100755 --- a/packaging/mother/colibri-mcp-ssh +++ b/packaging/mother/colibri-mcp-ssh @@ -31,12 +31,8 @@ case "${SSH_ORIGINAL_COMMAND:-}" in # "model":"deepseek-chat","input_tokens":150,"output_tokens":80, # "cache_read_tokens":200,"cache_write_tokens":50, # "cost_usd":0.0042,"success":true, -<<<<<<< HEAD - # "proof_text":"agent:hermes|cost:0.0042|tokens:150/80", - # "screenshot_uuid":"a1b2c3d4e5f6", -======= # "proof_text":"{\"agent\":\"zot\",\"state\":\"Done\",\"tokens_in\":150}", ->>>>>>> f46f3d2 (chore: polish proof_text — stale comments, duplicate column, schema docs, fmt) + # "screenshot_uuid":"a1b2c3d4e5f6", # "finished_at":"2026-06-27T12:00:00Z"} psql -d mother_hive -tA -v ON_ERROR_STOP=1 <<'PSQL' INSERT INTO task_costs (node_id, task_id, provider, model, diff --git a/packaging/mother/mother_schema.sql b/packaging/mother/mother_schema.sql index 1bffb3c..7cd1715 100644 --- a/packaging/mother/mother_schema.sql +++ b/packaging/mother/mother_schema.sql @@ -65,12 +65,8 @@ CREATE TABLE IF NOT EXISTS task_costs ( cache_write_tokens BIGINT NOT NULL DEFAULT 0, cost_usd DOUBLE PRECISION NOT NULL DEFAULT 0.0, success BOOLEAN NOT NULL DEFAULT false, -<<<<<<< HEAD - proof_text TEXT, -- glasspane evidence at task exit (agent, state, tokens) + proof_text TEXT, -- glasspane state snapshot (agent, state, tokens, cost as JSON) screenshot_uuid TEXT, -- visual terminal proof (PNG capture UUID) -======= - proof_text TEXT, -- glasspane state snapshot (agent, state, tokens, cost as JSON) ->>>>>>> f46f3d2 (chore: polish proof_text — stale comments, duplicate column, schema docs, fmt) finished_at TIMESTAMPTZ NOT NULL DEFAULT now(), reported_at TIMESTAMPTZ NOT NULL DEFAULT now() ); -- 2.45.3