Skip to content

Accidental PR — opened against wrong repo - #25

Closed
jacktator wants to merge 2 commits into
huohuoer:mainfrom
landit-au:road-354-expose-labels-phone-msgid
Closed

jacktator wants to merge 2 commits into
huohuoer:mainfrom
landit-au:road-354-expose-labels-phone-msgid

Conversation

@jacktator

@jacktator jacktator commented Sep 17, 2026

Copy link
Copy Markdown

Opened by mistake against upstream instead of a private fork. Please disregard — closed.

Chen17-sq and others added 2 commits September 18, 2026 08:35
The C binary find_all_keys_macos writes JSON in the schema
{"db.path": {"enc_key": "..."}} (without a salt field), but the
Python wrapper at scanner_macos.py was filtering on both enc_key and salt,
so every entry was rejected and key_map ended up empty. init.py then
echoed 'Extracted 0 keys' even though all_keys.json was correctly written
and downstream queries worked.

Build key_map keyed by rel_path instead, matching the C binary's actual
output and how core/key_utils.get_key_info already does lookups.

Fixes #2
- Decode contact.extra_buffer protobuf blob: field 30 (label IDs,
  joined to contact_label for names) and field 14->2->1 (mobile
  number) via one shared varint/tag parser. Surfaced as labels/phone
  in contacts list JSON and contacts --detail (labels, label_ids,
  phone).
- Add server_id to the message query and return structured entries
  from collect_chat_history; history JSON now emits
  local_id/server_id/timestamp/time/sender/text per message, enabling
  wechat_message_id-based dedup. Text output and export unchanged.
- Cherry-pick huohuoer#4: fix key_map indexing so init no
  longer misreports "提取到 0 个密钥" after a successful scan.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
@jacktator

Copy link
Copy Markdown
Author

Opened against wrong repo (intended for the landit-au fork). Closing.

@jacktator jacktator closed this Sep 17, 2026
@jacktator jacktator changed the title ROAD-354: expose contact labels, phone, and stable message IDs Accidental PR — opened against wrong repo Sep 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants