create-egregore 0.19.30 → 0.19.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,6 +23,11 @@ from datetime import datetime, timezone
23
23
  from pathlib import Path
24
24
  from xml.etree import ElementTree
25
25
 
26
+ sys.path.insert(0, str(Path(__file__).resolve().parent))
27
+ import doc_segment # noqa: E402 (same-directory module, path set above)
28
+ import pdf_extract # noqa: E402
29
+ import source_profile # noqa: E402
30
+
26
31
 
27
32
  ROOT = Path(__file__).resolve().parent.parent
28
33
  CONFIG = ROOT / "egregore.json"
@@ -99,31 +104,32 @@ def parse_boundaries(items: list[str]) -> dict[str, str]:
99
104
  return dict(sorted(result.items()))
100
105
 
101
106
 
102
- def read_text(path: Path) -> tuple[str | None, str | None, str | None]:
107
+ def read_text(path: Path) -> tuple[str | None, str | None, str | None, dict | None]:
108
+ """Extract text. Returns (text, error, extractor, detail).
109
+
110
+ `detail` carries per-page extraction facts for formats that have pages, so the
111
+ manifest records which pages needed OCR and which remain sparse or blank.
112
+ """
103
113
  ext = path.suffix.lower()
104
114
  try:
105
115
  if ext in TEXT_EXTS:
106
- return path.read_text(encoding="utf-8", errors="replace"), None, "builtin-text"
116
+ return path.read_text(encoding="utf-8", errors="replace"), None, "builtin-text", None
107
117
  if ext in HTML_EXTS:
108
118
  raw = path.read_text(encoding="utf-8", errors="replace")
109
119
  raw = re.sub(r"(?is)<(script|style).*?>.*?</\1>", " ", raw)
110
- return html.unescape(re.sub(r"(?s)<[^>]+>", " ", raw)), None, "builtin-html"
120
+ return html.unescape(re.sub(r"(?s)<[^>]+>", " ", raw)), None, "builtin-html", None
111
121
  if ext == ".docx":
112
122
  with zipfile.ZipFile(path) as archive:
113
123
  raw = archive.read("word/document.xml")
114
124
  root = ElementTree.fromstring(raw)
115
- return "\n".join(t.text or "" for t in root.iter() if t.tag.endswith("}t")), None, "builtin-docx"
125
+ text = "\n".join(t.text or "" for t in root.iter() if t.tag.endswith("}t"))
126
+ return text, None, "builtin-docx", None
116
127
  if ext == ".pdf":
117
- tool = shutil.which("pdftotext")
118
- if not tool:
119
- return None, "pdf requires a text-layer or runtime-native extraction", None
120
- proc = subprocess.run([tool, str(path), "-"], check=False, capture_output=True, text=True)
121
- if proc.returncode:
122
- return None, f"pdftotext failed ({proc.returncode})", None
123
- return proc.stdout, None, "pdftotext"
128
+ result = pdf_extract.extract(path)
129
+ return result.text, result.error, result.extractor, (result.report or None)
124
130
  except (OSError, ValueError, zipfile.BadZipFile, ElementTree.ParseError) as exc:
125
- return None, str(exc), None
126
- return None, f"unsupported extension {ext or '(none)'}", None
131
+ return None, str(exc), None, None
132
+ return None, f"unsupported extension {ext or '(none)'}", None, None
127
133
 
128
134
 
129
135
  def chunks(text: str, limit: int = 7000) -> list[str]:
@@ -146,6 +152,23 @@ def chunks(text: str, limit: int = 7000) -> list[str]:
146
152
  return result
147
153
 
148
154
 
155
+ def publisher_profile() -> dict | None:
156
+ """Load the instance's publisher profile, if one is configured.
157
+
158
+ Resolution is recorded as evidence only. It never overrides a boundary the
159
+ operator set: deriving a region is an inference, and an inference must not
160
+ silently replace a stated fact.
161
+ """
162
+ override = os.environ.get("EGREGORE_PUBLISHER_PROFILE")
163
+ path = Path(override) if override else (metadata_root() / "publisher-profile.json")
164
+ if not path.is_file():
165
+ return None
166
+ try:
167
+ return json.loads(path.read_text(encoding="utf-8"))
168
+ except (OSError, json.JSONDecodeError):
169
+ return None
170
+
171
+
149
172
  def source_dir(source_id: str) -> Path:
150
173
  return metadata_root() / "sources" / slug(source_id)
151
174
 
@@ -200,6 +223,7 @@ def add_path(args: argparse.Namespace) -> dict:
200
223
  existing_manifest = load_manifest(directory)
201
224
  previous = {d["id"]: d for d in existing_manifest.get("documents", [])}
202
225
  now = datetime.now(timezone.utc).isoformat()
226
+ profile = publisher_profile()
203
227
  ingested = unchanged = metadata_updated = skipped = pruned = 0
204
228
  errors: list[dict] = []
205
229
  seen_paths: set[str] = set()
@@ -224,8 +248,10 @@ def add_path(args: argparse.Namespace) -> dict:
224
248
  text, error = registered["text"], None
225
249
  extraction = {"kind": "runtime", "extractor": registered["extractor"]}
226
250
  else:
227
- text, error, extractor = read_text(path)
251
+ text, error, extractor, detail = read_text(path)
228
252
  extraction = {"kind": "local", "extractor": extractor} if extractor else None
253
+ if extraction and detail:
254
+ extraction["pages"] = detail
229
255
  if error or text is None or not text.strip():
230
256
  skipped += 1
231
257
  errors.append({"path": relative, "error": error or "empty extracted text"})
@@ -255,13 +281,49 @@ def add_path(args: argparse.Namespace) -> dict:
255
281
  ):
256
282
  unchanged += 1
257
283
  continue
258
- document_chunks = chunks(text)
284
+ # Segment before chunking so no passage straddles two works. A document
285
+ # holding a single work yields one segment, and chunking is unchanged.
286
+ segments = doc_segment.segment(text)
287
+ document_chunks: list[tuple[str, doc_segment.Segment]] = []
288
+ for seg in segments:
289
+ for piece in chunks(seg.text(text)):
290
+ document_chunks.append((piece, seg))
291
+
259
292
  chunk_rows = []
260
293
  body = []
261
- for index, content in enumerate(document_chunks, 1):
294
+ for index, (content, seg) in enumerate(document_chunks, 1):
262
295
  chunk_id = f"{doc_id}-c{index:04d}-{digest(content, 8)}"
263
- chunk_rows.append({"id": chunk_id, "index": index, "sha256": hashlib.sha256(content.encode()).hexdigest()})
296
+ row = {"id": chunk_id, "index": index, "sha256": hashlib.sha256(content.encode()).hexdigest()}
297
+ if seg.kind != "article" or seg.label:
298
+ row["segment"] = {"kind": seg.kind, **({"label": seg.label} if seg.label else {})}
299
+ chunk_rows.append(row)
264
300
  body.append(f"## Chunk {index:04d}\n\n<!-- ingest-chunk: {chunk_id} -->\n\n{content}")
301
+
302
+ structure = {
303
+ "segments": len([s for s in segments if s.kind == "article"]),
304
+ "summary": doc_segment.summarise(segments),
305
+ }
306
+ derived_year = doc_segment.publication_year(segments)
307
+ if derived_year:
308
+ structure["publication_year"] = derived_year
309
+ structure["year_source"] = "running_head"
310
+
311
+ # Fill in boundaries the operator left blank, when the instance supplies a
312
+ # profile that can work them out from where the document came from. People
313
+ # dumping a folder of documents will not type these in, and a boundary that
314
+ # is absent filters nothing. A derived value is marked as derived: anything
315
+ # downstream can tell it apart from one a person stated, and weigh it by the
316
+ # confidence recorded alongside. An operator's value is never overwritten.
317
+ provenance = None
318
+ doc_boundaries = dict(boundaries)
319
+ if profile:
320
+ resolved = source_profile.resolve(profile, filename=relative)
321
+ if resolved.publisher_class or resolved.notes:
322
+ provenance = resolved.as_dict()
323
+ key = source_profile.boundary_key(profile)
324
+ if key and resolved.zone and key not in doc_boundaries:
325
+ doc_boundaries[key] = resolved.zone
326
+ provenance = {**(provenance or {}), "applied_boundary": key, "derived": True}
265
327
  out_path = docs_dir / f"{doc_id}.md"
266
328
  frontmatter = {
267
329
  "id": doc_id,
@@ -274,8 +336,10 @@ def add_path(args: argparse.Namespace) -> dict:
274
336
  "normalized_content_hash": normalized_hash,
275
337
  "revision": content_hash[:16],
276
338
  "status": "unverified",
277
- "boundaries": boundaries,
339
+ "boundaries": doc_boundaries,
278
340
  "extraction": extraction,
341
+ "structure": structure,
342
+ "provenance": provenance,
279
343
  "ingested_at": now,
280
344
  }
281
345
  yaml_lines = ["---"] + [f"{key}: {json.dumps(value, ensure_ascii=False)}" for key, value in frontmatter.items()] + ["---", ""]
@@ -292,7 +356,9 @@ def add_path(args: argparse.Namespace) -> dict:
292
356
  "bytes": size_bytes,
293
357
  "chunks": chunk_rows,
294
358
  "extraction": extraction,
295
- "boundaries": boundaries,
359
+ "structure": structure,
360
+ "provenance": provenance,
361
+ "boundaries": doc_boundaries,
296
362
  "status": "unverified",
297
363
  "ingested_at": now,
298
364
  }
@@ -204,8 +204,56 @@ cmd_search() {
204
204
  (.[] | "\n### " + (.title // .file) + "\n" + .file + "\n\n" + (.snippet // ""))'
205
205
  }
206
206
 
207
+ cmd_select() {
208
+ # Stitch the Google sign-in into the picker itself: when the shim ships and
209
+ # no account is connected yet, pre-start the OAuth listener and hand its
210
+ # consent URL to the surface — clicking Google then continues the SAME tab
211
+ # into sign-in instead of bouncing through the terminal. Already connected:
212
+ # pass the account so the page says so honestly. Everything degrades to the
213
+ # terminal-guided flow when the URL isn't ready in time.
214
+ local auth_urls="{}" accounts="{}" auth_pid="" auth_log="" result status=0
215
+ if [ -x "$ROOT/bin/connector-google.sh" ]; then
216
+ local active_account
217
+ active_account="$(jq -r '.google_account // empty' "$ROOT/.egregore-state.json" 2>/dev/null)"
218
+ if [ -n "$active_account" ]; then
219
+ accounts="$(jq -cn --arg a "$active_account" '{google: $a}')"
220
+ else
221
+ auth_log="$(mktemp)"
222
+ bash "$ROOT/bin/connector-google.sh" auth --print-url > "$auth_log" 2>/dev/null &
223
+ auth_pid=$!
224
+ local waited=0 url=""
225
+ while [ "$waited" -lt 15 ]; do
226
+ url="$(head -1 "$auth_log" 2>/dev/null | jq -r '.auth_url // empty' 2>/dev/null)"
227
+ [ -n "$url" ] && break
228
+ sleep 1; waited=$((waited + 1))
229
+ done
230
+ if [ -n "$url" ]; then
231
+ auth_urls="$(jq -cn --arg u "$url" '{google: $u}')"
232
+ fi
233
+ fi
234
+ fi
235
+ result="$(EGREGORE_CONNECTOR_AUTH_URLS="$auth_urls" EGREGORE_CONNECTOR_ACCOUNTS="$accounts" python3 "$SURFACE" "$@")" || status=$?
236
+ if [ -n "$auth_pid" ]; then
237
+ if [ "$(printf '%s' "$result" | jq -r '.auth // empty' 2>/dev/null)" = "in-browser" ]; then
238
+ # The user is on Google's consent page in their tab; the listener
239
+ # finishes the token exchange. Wait for it and fold in the outcome.
240
+ if wait "$auth_pid" 2>/dev/null; then
241
+ result="$(printf '%s' "$result" | jq -c '. + {auth: "connected"}')"
242
+ else
243
+ result="$(printf '%s' "$result" | jq -c '. + {auth: "failed"}')"
244
+ fi
245
+ else
246
+ kill "$auth_pid" 2>/dev/null || true
247
+ wait "$auth_pid" 2>/dev/null || true
248
+ fi
249
+ fi
250
+ [ -n "$auth_log" ] && rm -f "$auth_log"
251
+ printf '%s\n' "$result"
252
+ return "$status"
253
+ }
254
+
207
255
  case "${1:-}" in
208
- select) shift; python3 "$SURFACE" "$@" ;;
256
+ select) shift; cmd_select "$@" ;;
209
257
  add) shift; cmd_add "$@" ;;
210
258
  add-selection) shift; cmd_add_selection "$@" ;;
211
259
  register-extraction) shift; python3 "$PY" register-extraction "$@" ;;
@@ -13,9 +13,10 @@ from typing import Any
13
13
 
14
14
  ROOT = Path(__file__).resolve().parent.parent
15
15
  CORPUS_SCHEMA = "egregore-ingest-corpus/v1"
16
+ CONNECTOR_SCHEMA = "egregore-connector-lifecycle/v1"
16
17
  KNOWLEDGE_SCHEMA = "egregore-knowledge-projection/v1"
17
18
  PLAN_SCHEMA = "egregore-ingest-graph-plan/v2"
18
- SOURCE_KINDS = {"meeting", "interview", "google", "corpus", "document"}
19
+ SOURCE_KINDS = {"meeting", "interview", "google", "notion", "corpus", "document"}
19
20
  SOURCE_RELATIONS = {"INVOLVES", "CONDUCTED_BY"}
20
21
  ARTIFACT_RELATIONS = {"RELATES_TO", "SUPERSEDES"}
21
22
  ARTIFACT_LABELS = {
@@ -438,6 +439,8 @@ def source_shape(kind: str) -> tuple[str, str]:
438
439
  return "Interview:KnowledgeSource", "FROM_INTERVIEW"
439
440
  if kind == "google":
440
441
  return "Artifact:KnowledgeSource", "DERIVED_FROM"
442
+ if kind == "notion":
443
+ return "Artifact:KnowledgeSource", "DERIVED_FROM"
441
444
  if kind == "corpus":
442
445
  return "IngestSource:KnowledgeSource", "DERIVED_FROM"
443
446
  return "IngestDocument:Document:KnowledgeSource", "DERIVED_FROM"
@@ -728,7 +731,84 @@ RETURN a.id""",
728
731
  }
729
732
 
730
733
 
734
+ def connector_manifest(value: dict[str, Any]) -> bool:
735
+ return value.get("schema") == CONNECTOR_SCHEMA
736
+
737
+
738
+ def connector_plan(value: dict[str, Any], path: Path) -> dict[str, Any]:
739
+ """Project connector lifecycle: which providers this org has connected,
740
+ which accounts are authorized on each, and which ingest sources arrived
741
+ through which account. Connected mode only — the plan is executed by the
742
+ same runner as corpus plans and is idempotent (MERGE throughout)."""
743
+ provider = required_string(value.get("provider"), "provider")
744
+ if provider not in ("google", "notion"):
745
+ raise ContractError(f"unsupported connector provider: {provider}")
746
+ accounts = value.get("accounts")
747
+ if not isinstance(accounts, list) or not accounts:
748
+ raise ContractError("accounts must be a non-empty list")
749
+ recorded = required_string(value.get("recorded_at"), "recorded_at")
750
+ source_id = str(value.get("source_id") or "")
751
+ queries: list[dict[str, Any]] = []
752
+ queries.append(
753
+ query(
754
+ """MERGE (c:Connector {id: $provider})
755
+ SET c.provider = $provider,
756
+ c.updatedAt = datetime($recorded)
757
+ RETURN c.id""",
758
+ {"provider": provider, "recorded": recorded},
759
+ )
760
+ )
761
+ for entry in accounts:
762
+ if not isinstance(entry, dict):
763
+ raise ContractError("each account must be an object")
764
+ email = required_string(entry.get("email"), "accounts[].email")
765
+ status = str(entry.get("status") or "authorized")
766
+ if status not in ("authorized", "revoked"):
767
+ raise ContractError(f"unsupported account status: {status}")
768
+ account_id = f"{provider}:{email.lower()}"
769
+ queries.append(
770
+ query(
771
+ """MERGE (a:SourceAccount {id: $id})
772
+ SET a.email = $email,
773
+ a.provider = $provider,
774
+ a.status = $status,
775
+ a.updatedAt = datetime($recorded)
776
+ FOREACH (_ IN CASE WHEN $status = 'authorized' AND a.authorizedAt IS NULL THEN [1] ELSE [] END |
777
+ SET a.authorizedAt = datetime($recorded)
778
+ )
779
+ WITH a
780
+ MATCH (c:Connector {id: $provider})
781
+ MERGE (a)-[:ON]->(c)
782
+ WITH a
783
+ OPTIONAL MATCH (s:IngestSource {id: $sourceId})
784
+ FOREACH (_ IN CASE WHEN s IS NULL OR $sourceId = '' THEN [] ELSE [1] END |
785
+ MERGE (s)-[v:VIA_ACCOUNT]->(a)
786
+ SET v.recordedAt = datetime($recorded)
787
+ )
788
+ RETURN a.id""",
789
+ {
790
+ "id": account_id,
791
+ "email": email,
792
+ "provider": provider,
793
+ "status": status,
794
+ "recorded": recorded,
795
+ "sourceId": source_id,
796
+ },
797
+ )
798
+ )
799
+ return {
800
+ "schema": PLAN_SCHEMA,
801
+ "schema_family": "connector-lifecycle",
802
+ "manifest_id": f"connector:{provider}",
803
+ "source": {"kind": "connector", "id": provider},
804
+ "query_count": len(queries),
805
+ "queries": queries,
806
+ }
807
+
808
+
731
809
  def build_plan(value: dict[str, Any], path: Path) -> dict[str, Any]:
810
+ if connector_manifest(value):
811
+ return connector_plan(value, path)
732
812
  if corpus_manifest(value):
733
813
  return corpus_plan(value, path)
734
814
  return knowledge_plan(value, path)
@@ -232,6 +232,39 @@ class SelectionState:
232
232
  self.done.set()
233
233
  return self.result
234
234
 
235
+ def choose_connector(self, payload: dict) -> dict:
236
+ # A connector choice ends the local-selection flow. When the CLI
237
+ # pre-started an OAuth listener, the browser response carries its
238
+ # consent URL so THIS tab continues straight into Google's sign-in;
239
+ # otherwise the agent guides authorization from the terminal. No bytes
240
+ # are staged and no source contract is collected here.
241
+ with self.lock:
242
+ if self.done.is_set():
243
+ raise ValueError("selection already finished")
244
+ provider = str(payload.get("provider", "")).strip().lower()
245
+ if provider not in available_connectors():
246
+ raise ValueError(f"unknown connector: {provider or '(empty)'}")
247
+ redirect = connector_auth_urls().get(provider, "")
248
+ account = connector_accounts().get(provider, "")
249
+ self.result = {
250
+ "connector": provider,
251
+ "receipt_url": self.receipt_url,
252
+ }
253
+ if redirect:
254
+ self.result["auth"] = "in-browser"
255
+ elif account:
256
+ self.result["account"] = account
257
+ self.receipt = {
258
+ **self.result,
259
+ "status": "processing",
260
+ "message": "The agent is walking you through connecting this source in the terminal.",
261
+ }
262
+ self.done.set()
263
+ response = dict(self.result)
264
+ if redirect:
265
+ response["redirect"] = redirect
266
+ return response
267
+
235
268
  def finish_receipt(self, payload: dict) -> dict:
236
269
  with self.lock:
237
270
  if not self.done.is_set() or self.cancelled:
@@ -252,10 +285,53 @@ class SelectionState:
252
285
  shutil.rmtree(self.session_root, ignore_errors=True)
253
286
 
254
287
 
288
+ def available_connectors() -> list[str]:
289
+ # A connector is offered when its runtime shim ships with this instance.
290
+ # Authorization state is NOT checked here — the button's job is to route
291
+ # the user into the guided setup, which handles both fresh and connected.
292
+ here = Path(__file__).parent
293
+ providers = []
294
+ if (here / "connector-google.sh").exists():
295
+ providers.append("google")
296
+ if (here / "connector-notion.sh").exists():
297
+ providers.append("notion")
298
+ return providers
299
+
300
+
301
+ def _env_json_map(name: str) -> dict[str, str]:
302
+ try:
303
+ value = json.loads(os.environ.get(name, "") or "{}")
304
+ except json.JSONDecodeError:
305
+ return {}
306
+ if not isinstance(value, dict):
307
+ return {}
308
+ return {str(k): str(v) for k, v in value.items() if isinstance(v, (str, int))}
309
+
310
+
311
+ def connector_auth_urls() -> dict[str, str]:
312
+ # Consent URLs pre-fetched by the CLI (listener already running) so a
313
+ # connector click can redirect this same tab straight into sign-in.
314
+ # Only loopback/HTTPS URLs are accepted.
315
+ urls = {}
316
+ for provider, url in _env_json_map("EGREGORE_CONNECTOR_AUTH_URLS").items():
317
+ if url.startswith("https://") or url.startswith("http://127.0.0.1") or url.startswith("http://localhost"):
318
+ urls[provider] = url
319
+ return urls
320
+
321
+
322
+ def connector_accounts() -> dict[str, str]:
323
+ # Already-connected account per provider, for honest completion copy.
324
+ return _env_json_map("EGREGORE_CONNECTOR_ACCOUNTS")
325
+
326
+
255
327
  def handler_class(state: SelectionState, token: str, expected_origin: str, preference_file: Path | None = None):
256
328
  html_template = HTML_PATH.read_text(encoding="utf-8")
257
329
  design_css = DESIGN_CSS_PATH.read_text(encoding="utf-8")
258
- capabilities = {"pdftotext": bool(shutil.which("pdftotext"))}
330
+ capabilities = {
331
+ "pdftotext": bool(shutil.which("pdftotext")),
332
+ "connectors": available_connectors(),
333
+ "connector_accounts": connector_accounts(),
334
+ }
259
335
  preferences = load_preferences(preference_file or preferences_path())
260
336
  page = (
261
337
  html_template.replace("__EGREGORE_DESIGN_CSS__", design_css)
@@ -349,6 +425,10 @@ def handler_class(state: SelectionState, token: str, expected_origin: str, prefe
349
425
  result = state.confirm(self.read_json())
350
426
  self.send_json(200, result)
351
427
  return
428
+ if path == "/api/connector":
429
+ result = state.choose_connector(self.read_json())
430
+ self.send_json(200, result)
431
+ return
352
432
  if path == "/api/cancel":
353
433
  state.cancel()
354
434
  self.send_json(200, {"cancelled": True})
@@ -35,6 +35,7 @@ chmod 700 "$STATE_DIR" 2>/dev/null || true
35
35
  if [ -f "$SCRIPT_DIR/.env" ]; then
36
36
  EGREGORE_API_URL="${EGREGORE_API_URL:-$(grep '^EGREGORE_API_URL=' "$SCRIPT_DIR/.env" 2>/dev/null | cut -d'=' -f2- || true)}"
37
37
  EGREGORE_API_KEY="${EGREGORE_API_KEY:-$(grep '^EGREGORE_API_KEY=' "$SCRIPT_DIR/.env" 2>/dev/null | cut -d'=' -f2- || true)}"
38
+ SLACK_BOT_TOKEN="${SLACK_BOT_TOKEN:-$(grep '^SLACK_BOT_TOKEN=' "$SCRIPT_DIR/.env" 2>/dev/null | cut -d'=' -f2- || true)}"
38
39
  fi
39
40
  API_URL="${EGREGORE_API_URL:-$(jq -r '.api_url // empty' "$CONFIG" 2>/dev/null)}"
40
41
  API_KEY="${EGREGORE_API_KEY:-}"
@@ -178,6 +179,8 @@ write_plan() {
178
179
  }' "$path"
179
180
  }
180
181
 
182
+ # Channel-generic despite the name: reads any field from .egregore-state.json
183
+ # with egregore.json as the legacy fallback (telegram_*, slack_*, …).
181
184
  read_local_telegram_config() {
182
185
  local field="$1"
183
186
  local state_file="$SCRIPT_DIR/.egregore-state.json"
@@ -220,24 +223,38 @@ plan_local() {
220
223
  die "direct messages are unavailable in local mode; no group fallback was sent"
221
224
  fi
222
225
 
223
- local chat_id group_link destination
226
+ local chat_id group_link slack_channel deliveries
224
227
  chat_id="$(read_local_telegram_config telegram_chat_id)"
225
228
  group_link="$(read_local_telegram_config telegram_group_link)"
226
- [ -n "$chat_id" ] || [ -n "$group_link" ] ||
227
- die "no Telegram group is configured"
228
- destination="${group_link:-$chat_id}"
229
+ slack_channel="$(read_local_telegram_config slack_channel_id)"
230
+
231
+ deliveries="[]"
232
+ if [ -n "$chat_id" ] || [ -n "$group_link" ]; then
233
+ deliveries="$(printf '%s' "$deliveries" | jq -c \
234
+ --arg destination "${group_link:-$chat_id}" \
235
+ '. + [{channel:"telegram", destination:$destination, kind:"group"}]')"
236
+ fi
237
+ # Slack is local-direct (the org owns the app and token): plan it only when
238
+ # both halves of the config exist, so a half-configured Slack fails soft.
239
+ if [ -n "$slack_channel" ] && [ -n "${SLACK_BOT_TOKEN:-}" ]; then
240
+ deliveries="$(printf '%s' "$deliveries" | jq -c \
241
+ --arg destination "$slack_channel" \
242
+ '. + [{channel:"slack", destination:$destination, kind:"group"}]')"
243
+ fi
244
+ [ "$deliveries" != "[]" ] ||
245
+ die "no group notification channel is configured"
229
246
 
230
247
  local response
231
248
  response="$(jq -nc \
232
249
  --arg slug "$ORG_SLUG" \
233
250
  --arg org "$ORG_NAME" \
234
- --arg destination "$destination" \
251
+ --argjson deliveries "$deliveries" \
235
252
  '{
236
253
  status:"planned",
237
254
  org_slug:$slug,
238
255
  org_name:$org,
239
- channels:["telegram"],
240
- deliveries:[{channel:"telegram", destination:$destination, kind:"group"}],
256
+ channels:($deliveries | map(.channel)),
257
+ deliveries:$deliveries,
241
258
  no_fallback:true
242
259
  }')"
243
260
  write_plan "$response" "$kind" "$recipient" "$message"
@@ -342,11 +359,12 @@ dispatch_connected() {
342
359
  printf '%s\n' "$response"
343
360
  }
344
361
 
345
- dispatch_local() {
346
- local path="$1"
347
- local message destination chat_id group_link plan_slug plan_org response
348
- message="$(jq -r '.message' "$path")"
349
- destination="$(jq -r '.deliveries[0].destination' "$path")"
362
+ dispatch_local_telegram() {
363
+ local destination="$1"
364
+ local message="$2"
365
+ local plan_slug="$3"
366
+ local plan_org="$4"
367
+ local chat_id group_link
350
368
  case "$destination" in
351
369
  https://t.me/*)
352
370
  chat_id=""
@@ -357,9 +375,7 @@ dispatch_local() {
357
375
  group_link=""
358
376
  ;;
359
377
  esac
360
- plan_slug="$(jq -r '.org_slug' "$path")"
361
- plan_org="$(jq -r '.org_name' "$path")"
362
- response="$(curl -sS -X POST "${RELAY_URL}/api/notify/relay" \
378
+ curl -sS -X POST "${RELAY_URL}/api/notify/relay" \
363
379
  -H "Content-Type: application/json" \
364
380
  -d "$(jq -nc \
365
381
  --arg chat_id "$chat_id" \
@@ -368,12 +384,84 @@ dispatch_local() {
368
384
  --arg slug "$plan_slug" \
369
385
  --arg org_name "$plan_org" \
370
386
  '{chat_id:$chat_id,group_link:$group_link,message:$message,slug:$slug,org_name:$org_name}')" \
371
- --max-time 10)" || return 1
372
- printf '%s' "$response" | jq -e '.status == "sent"' >/dev/null 2>&1 || {
373
- printf '%s\n' "$response"
374
- return 1
387
+ --max-time 10
388
+ }
389
+
390
+ # Local-direct: the org owns the Slack app and token, so the message goes
391
+ # straight from this machine to Slack — never through the Egregore relay.
392
+ dispatch_local_slack() {
393
+ local destination="$1"
394
+ local message="$2"
395
+ if [ -z "${SLACK_BOT_TOKEN:-}" ]; then
396
+ jq -nc '{status:"error",detail:"SLACK_BOT_TOKEN is missing from .env"}'
397
+ return 0
398
+ fi
399
+ local response
400
+ response="$(curl -sS -X POST "https://slack.com/api/chat.postMessage" \
401
+ -H "Authorization: Bearer $SLACK_BOT_TOKEN" \
402
+ -H "Content-Type: application/json; charset=utf-8" \
403
+ -d "$(jq -nc \
404
+ --arg channel "$destination" \
405
+ --arg text "$message" \
406
+ '{channel:$channel,text:$text,unfurl_links:false}')" \
407
+ --max-time 10)" || {
408
+ jq -nc '{status:"error",detail:"Slack request failed"}'
409
+ return 0
375
410
  }
376
- printf '%s\n' "$response"
411
+ if printf '%s' "$response" | jq -e '.ok == true' >/dev/null 2>&1; then
412
+ jq -nc '{status:"sent"}'
413
+ else
414
+ jq -nc \
415
+ --arg detail "$(printf '%s' "$response" | jq -r '.error // "unknown"' 2>/dev/null || echo unknown)" \
416
+ '{status:"error",detail:$detail}'
417
+ fi
418
+ }
419
+
420
+ dispatch_local() {
421
+ local path="$1"
422
+ local message plan_slug plan_org count i channel destination result
423
+ message="$(jq -r '.message' "$path")"
424
+ plan_slug="$(jq -r '.org_slug' "$path")"
425
+ plan_org="$(jq -r '.org_name' "$path")"
426
+ count="$(jq -r '.deliveries | length' "$path")"
427
+
428
+ # One platform failing must not mask another succeeding (mirror of the
429
+ # server-side send_group semantics).
430
+ local results="{}"
431
+ i=0
432
+ while [ "$i" -lt "$count" ]; do
433
+ channel="$(jq -r ".deliveries[$i].channel" "$path")"
434
+ destination="$(jq -r ".deliveries[$i].destination" "$path")"
435
+ case "$channel" in
436
+ telegram)
437
+ result="$(dispatch_local_telegram "$destination" "$message" "$plan_slug" "$plan_org")" ||
438
+ result='{"status":"error","detail":"relay request failed"}'
439
+ printf '%s' "$result" | jq -e . >/dev/null 2>&1 ||
440
+ result='{"status":"error","detail":"relay returned an unreadable response"}'
441
+ ;;
442
+ slack)
443
+ result="$(dispatch_local_slack "$destination" "$message")"
444
+ ;;
445
+ *)
446
+ result='{"status":"error","detail":"Unsupported channel"}'
447
+ ;;
448
+ esac
449
+ results="$(printf '%s' "$results" | jq -c --arg ch "$channel" --argjson r "$result" '. + {($ch): $r}')"
450
+ i=$((i + 1))
451
+ done
452
+
453
+ local sent
454
+ sent="$(printf '%s' "$results" | jq -c '[to_entries[] | select(.value.status == "sent") | .key]')"
455
+ if [ "$sent" = "[]" ]; then
456
+ printf '%s\n' "$results"
457
+ return 1
458
+ fi
459
+ printf '%s' "$results" | jq -c --argjson sent "$sent" \
460
+ '{status:"sent", platforms:$sent}
461
+ + ([to_entries[] | select(.value.status != "sent")] as $f
462
+ | if ($f | length) > 0
463
+ then {failed: ($f | map({(.key): (.value.detail // "unknown")}) | add)}
464
+ else {} end)'
377
465
  }
378
466
 
379
467
  dispatch_plan() {
@@ -469,12 +557,14 @@ test_connection() {
469
557
  -H "Authorization: Bearer $API_KEY" \
470
558
  --max-time 10
471
559
  elif [ "$MODE" = "local" ]; then
472
- local group_link
560
+ local group_link slack_channel
473
561
  group_link="$(read_local_telegram_config telegram_group_link)"
474
- if [ -n "$group_link" ]; then
562
+ slack_channel="$(read_local_telegram_config slack_channel_id)"
563
+ if [ -n "$group_link" ] ||
564
+ { [ -n "$slack_channel" ] && [ -n "${SLACK_BOT_TOKEN:-}" ]; }; then
475
565
  echo '{"status":"configured","mode":"local"}'
476
566
  else
477
- echo '{"status":"offline","reason":"no_telegram_group"}'
567
+ echo '{"status":"offline","reason":"no_notification_channel"}'
478
568
  fi
479
569
  else
480
570
  echo '{"status":"offline","reason":"no_api_key"}'