taskuary 0.3.2.7__tar.gz → 0.3.2.8__tar.gz

{taskuary-0.3.2.7/taskuary.egg-info → taskuary-0.3.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskuary
-Version: 0.3.2.7
+Version: 0.3.2.8
 Summary: Automate your job - the local-first operating system for your work: AI triage in, coding agents out.
 License: MIT
 Project-URL: Homepage, https://github.com/ldbumble/taskuary
@@ -64,7 +64,7 @@ and replies wait for your approval. Nothing sends or ships without you.
 
 ![The Taskuary Studio: work arrives, triage decides what needs action, and agents take seats to work it.](https://raw.githubusercontent.com/ldbumble/taskuary/master/docs/hero.gif)
 
-Taskuary is early—currently **v0.3.2.7**—and moving fast. The funnel, review queue,
+Taskuary is early—currently **v0.3.2.8**—and moving fast. The funnel, review queue,
 agent sessions, and reports pipeline are in daily use; breaking changes are still possible
 before 1.0.
 

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/README.md

@@ -13,7 +13,7 @@ and replies wait for your approval. Nothing sends or ships without you.
 
 ![The Taskuary Studio: work arrives, triage decides what needs action, and agents take seats to work it.](https://raw.githubusercontent.com/ldbumble/taskuary/master/docs/hero.gif)
 
-Taskuary is early—currently **v0.3.2.7**—and moving fast. The funnel, review queue,
+Taskuary is early—currently **v0.3.2.8**—and moving fast. The funnel, review queue,
 agent sessions, and reports pipeline are in daily use; breaking changes are still possible
 before 1.0.
 

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taskuary"
-version = "0.3.2.7"
+version = "0.3.2.8"
 description = "Automate your job - the local-first operating system for your work: AI triage in, coding agents out."
 readme = "README.md"
 license = { text = "MIT" }

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/taskuary/agents.py

@@ -200,6 +200,12 @@ def _live_line(j):
 # the CLI's own login has lapsed - nothing in Taskuary can renew it, only the user at a terminal can
 _SIGNED_OUT = re.compile(r'OAuth session expired|Failed to authenticate|not logged in|Not logged in|please (?:run )?[`\']?(?:claude )?/?login|codex login|401 Unauthorized', re.I)
 _LOGIN_HOW = {'claude': "run `claude`, type `/login` and finish the sign-in", 'codex': "run `codex login` and finish the sign-in"}
+# Provider/plan exhaustion is different from an agent failing the work. Only this availability
+# class is safe to hand to another configured agent automatically: a compile error should remain
+# with the agent that owns it, while "session limit; resets at 11:50" should not strand the task.
+_UNAVAILABLE = re.compile(
+    r'session limit|usage limit|rate limit|quota|capacity|temporarily unavailable|service unavailable|'
+    r'too many requests|resource exhausted|try again (?:at|after|later)|resets? (?:at|in)', re.I)
 
 def signed_out_msg(name: str, why: str) -> str:
     how = _LOGIN_HOW.get(name, f"run `{name}` and sign in again")
@@ -256,6 +262,13 @@ def runs_here(profile: dict) -> bool:
     except (FileNotFoundError, OSError): return False
 
 
+def availability_failure(error) -> bool:
+    """Can the same untouched work safely be retried on a backup provider?"""
+    text = str(error or '')
+    return isinstance(error, (FileNotFoundError, PermissionError)) or bool(
+        _UNAVAILABLE.search(text) or _SIGNED_OUT.search(text) or _DENIED.search(text) or _NO_HOME.search(text))
+
+
 def profiles(store) -> dict:
     out = {}
     for a in store.list_agents():
@@ -277,6 +290,23 @@ def default_agent(store) -> str:
     return next((n for n, prof in profs.items() if runs_here(prof)), want)
 
 
+def agent_chain(store, primary: str = None) -> list[str]:
+    """Primary plus ordered configured fallbacks, once each.
+
+    `backup_agents=*` is the out-of-box resilient choice: every other roster entry, in the
+    stable order the owner sees. Naming a CSV narrows and orders the chain explicitly.
+    """
+    names = [str(a.get('Name') or '').strip() for a in store.list_agents() if a.get('Name')]
+    head = str(primary or default_agent(store) or '').strip()
+    if head and head not in names: return [head]
+    setting = str(store.get_settings().get('backup_agents') or '').strip()
+    backups = names if setting == '*' else [x.strip() for x in setting.split(',') if x.strip()]
+    out = []
+    for name in [head, *backups]:
+        if name and name not in out and name in names: out.append(name)
+    return out
+
+
 def run_cli(profile: dict, prompt: str, trace, resume: str = None, cancel=None):
     """One headless invocation of the configured CLI, output STREAMED line by line into
     the run trace so the Board shows the agent working live. claude's stream-json events

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/taskuary/assistant.py

@@ -131,6 +131,11 @@ def _gist(body, n=180) -> str:
     from .triage import strip_boilerplate
     return _short(strip_boilerplate(_BANNER.sub('', str(body or ''))), n)
 
+
+def _reply_text(review: dict | None) -> str:
+    """The words that left through Review, never an unsent draft."""
+    return str((review or {}).get('FinalText') or (review or {}).get('DraftText') or '').strip()
+
 _OOO = re.compile(r'^(automatic reply|auto(matic)?[ -]?reply|out of (the )?office)', re.I)
 _UNTIL = re.compile(r'\b(until|through|returning( on)?|back (on|in the office on))\s+([A-Z][a-z]+day,?\s+)?([A-Z][a-z]+ \d{1,2}(st|nd|rd|th)?|\d{1,2}/\d{1,2}(/\d{2,4})?)', re.I)
 def ooo(store, days: int = 14) -> dict:
@@ -394,7 +399,26 @@ def _people_context(store, days: int = 2) -> tuple[str, list[int]]:
         who = next((c.get('FromName') or c.get('FromEmail') for c in reversed(chain) if not mine(c)), rs[0].get('FromName') or '?')
         tid = next((c.get('TaskId') for c in reversed(chain) if c.get('TaskId')), None)
         t = store.get_task(tid) if tid else None
-        head = (f"- {who} [{rs[0].get('Channel')}] re \"{_short(rs[0].get('Subject'), 60)}\" - {len(rs)} new, last word {'YOURS' if mine(last) else 'THEIRS'} {_when(last['SentAt'])}"
+        # A reply sent from Review has a durable send receipt there, but many channels do not
+        # ingest that outbound line back into `message` immediately. Without this virtual final
+        # message, the Assistant saw the finished task and the inbound ask, then confidently
+        # claimed "nobody told them" minutes after the owner had approved and sent the reply.
+        sent = store.sent_reply(task_id=tid) if tid else None
+        if not sent:
+            for c in reversed(chain):
+                sent = store.sent_reply(message_id=c['MessageId'])
+                if sent: break
+        sent_text = _reply_text(sent)
+        sent_at = (sent or {}).get('DecidedAt') or (sent or {}).get('CreatedAt')
+        # Do not print it twice once the channel has ingested the same outbound line as context.
+        sent_norm = ' '.join(sent_text.split()).casefold()
+        own_after = any(mine(c) and (
+            ' '.join(str(c.get('BodyText') or '').split()).casefold() == sent_norm
+            or (sent_at and _ts(c.get('SentAt')) >= _ts(sent_at))) for c in chain)
+        virtual_reply = bool(sent_text and not own_after)
+        last_mine = virtual_reply or mine(last)
+        last_at = sent_at if virtual_reply else last.get('SentAt')
+        head = (f"- {who} [{rs[0].get('Channel')}] re \"{_short(rs[0].get('Subject'), 60)}\" - {len(rs)} new, last word {'YOURS' if last_mine else 'THEIRS'} {_when(last_at)}"
                 + (f", {task_ref(tid)} {t.get('Kind')} {t.get('Status')}" if t else '') + f" (latest mid {rs[0]['MessageId']})")
         first = lambda c: ((c.get('FromName') or c.get('FromEmail') or '?').split(',')[0].split() or ['?'])[0]
         def quote(c):
@@ -404,6 +428,8 @@ def _people_context(store, days: int = 2) -> tuple[str, list[int]]:
             return (f"    {'you' if mine(c) else first(c)} {_when(c['SentAt'])[:6]}: \"{_gist(c.get('BodyText'), 150)}\""
                     + (f" [attachments: {files}]" if files else ''))
         quotes = [quote(c) for c in chain]
+        if virtual_reply:
+            quotes.append(f"    you {_when(sent_at)[:6]}: \"{_gist(sent_text, 150)}\" [reply sent from Review]")
         block = '\n'.join([head] + [q for q in quotes if not q.endswith(': ""')])
         if used + len(block) > PEOPLE_CHARS: break
         out.append(block); used += len(block); mids += [c['MessageId'] for c in chain]
@@ -510,6 +536,34 @@ def parse(text: str, cands: list, max_lines: int = MAX_LINES) -> list:
     return out
 
 
+_UNANSWERED_CLAIM = re.compile(
+    r"\b(no (?:reply|response|answer)|nobody (?:told|replied|answered)|"
+    r"has(?:n['’]?t| not) (?:been )?(?:told|answered)|"
+    r"(?:i['’]?d|would) (?:reply|answer)|ask (?:him|her|them) to retry)\b", re.I)
+
+
+def sent_reply_for(store, line: dict) -> dict | None:
+    """Find the successful send behind an idea, including another message in its task thread."""
+    action = line.get('action') or {}
+    mid, tid = action.get('mid'), action.get('tid')
+    reply = store.sent_reply(message_id=mid) if mid else None
+    if not tid and mid:
+        message = store.get_message(mid)
+        tid = (message or {}).get('TaskId')
+    return reply or (store.sent_reply(task_id=tid) if tid else None)
+
+
+def contradicts_sent_reply(store, line: dict) -> bool:
+    """Reject a model idea whose premise is disproved by an actual send receipt.
+
+    The full reply is also put into the model's people context. This is the final factual gate:
+    a model may overlook context, but Taskuary must not publish "nobody replied" when its own
+    Review table records the exact response and the successful decision.
+    """
+    if not _UNANSWERED_CLAIM.search(str(line.get('text') or '')): return False
+    return bool(sent_reply_for(store, line))
+
+
 def _ids(raw) -> list[int]:
     if not isinstance(raw, list): raw = [] if raw in (None, '') else [raw]
     out = []
@@ -896,7 +950,8 @@ def _run(store, llm, instruction) -> dict:
     # the state is read AGAIN here: another process may have posted while the model was thinking, and a
     # model echoing a dismissed key changes nothing
     state = {i['Key']: i for i in store.list_ideas()}
-    say = [s | {'why': s.get('why') or s.get('facts') or ''} for s in say if fresh(state, s, now)]
+    say = [s | {'why': s.get('why') or s.get('facts') or ''} for s in say
+           if fresh(state, s, now) and not contradicts_sent_reply(store, s)]
     rv = reviewed(cands, say, _recent(store), _open(store), _said(store), used, _week(store), _people(store)) | {'notes': note}
     if not say: return {'ran': True, 'said': 0, 'reviewed': rv, 'inputs': read}
     stamp = now.strftime('%Y-%m-%d %H:%M:%S')

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/taskuary/general.py

@@ -140,6 +140,19 @@ def _cut(text, n):
     return text if len(text) <= n else text[:n] + f'\n[trimmed {len(text) - n:,} characters]'
 
 
+def _task_files(store, tid: int) -> list[dict]:
+    """Files that arrived with the task's source messages, once each, in message order."""
+    detail = store.task_detail(tid) or {}
+    out, seen = [], set()
+    for message in detail.get('messages') or []:
+        for attachment in store.list_attachments(message['MessageId']):
+            path = str(attachment.get('Path') or '').strip()
+            key = path or f"attachment:{attachment.get('AttachmentId')}"
+            if key in seen: continue
+            seen.add(key); out.append(attachment)
+    return out
+
+
 # The chat is on the wall too (blackboard.py). It has no checkout, so it reads and writes the
 # HOUSE lane - the notes with no repository behind them - and it can only write when a CLI is
 # doing the thinking, because an API provider has no shell to run the command in.
@@ -185,7 +198,11 @@ def _prompt(store, tid: int) -> tuple[str, str]:
     sources = []
     for m in (detail.get('messages') or [])[-12:]:
         who = m.get('FromName') or m.get('FromEmail') or m.get('SourceName') or m.get('Channel') or 'source'
-        sources.append(f"FROM {who} ({m.get('SentAt') or ''})\n{_cut(m.get('BodyText'), 3_000)}")
+        files = store.list_attachments(m['MessageId'])
+        file_line = ('\nATTACHMENTS: ' + '; '.join(
+            str(a.get('Name') or 'file') + (f" ({a.get('Path')})" if a.get('Path') else '')
+            for a in files[:8])) if files else ''
+        sources.append(f"FROM {who} ({m.get('SentAt') or ''})\n{_cut(m.get('BodyText'), 3_000)}{file_line}")
     turns = []
     for c in chat_rows(store, tid)[-30:]:
         role = 'ASSISTANT' if c.get('ActorType') == ASSISTANT_TYPE else 'USER'
@@ -460,9 +477,9 @@ class GeneralSession:
                 system = f'{system}\n\n{POST_LINE}'
                 from . import handbook
                 if handbook.enabled(self.store): system = f'{system}\n\n{SOCIAL_LINE}'
-            paths = list(attachments or []) + [m.group('path') for m in _IMAGE_PATH.finditer(text)]
-            if paths and self.pick.startswith('cli:'):
-                user += '\n\nATTACHED FILES (read these when relevant)\n' + '\n'.join(str(Path(p).resolve()) for p in paths)
+            source_paths = [a.get('Path') for a in _task_files(self.store, self.task_id) if a.get('Path')]
+            paths = list(dict.fromkeys(source_paths + list(attachments or [])
+                                       + [m.group('path') for m in _IMAGE_PATH.finditer(text)]))
             def visible(kind, name, detail):
                 self._remember_trace(kind, name, detail)
                 if trace: trace(kind, name, detail)
@@ -480,6 +497,11 @@ class GeneralSession:
                                       trace=visible, cancel=cancel, resume=self.cli_sid or None)
             if not brain: raise RuntimeError('the selected AI connector is unavailable')
             if self.cli_sid: user = _turn_only(self.store, self.task_id, text)
+            # Paths are harmless context to an API brain and essential if its CLI backup takes
+            # over after a quota failure. The source message already names its files too; this
+            # line also carries images attached directly in the composer.
+            if paths:
+                user += '\n\nATTACHED FILES (read these when relevant)\n' + '\n'.join(str(Path(p).resolve()) for p in paths)
             try:
                 reply = str(brain(system, user, max_tokens=MAX_REPLY_TOKENS, images=_images(paths)) or '').strip()
             except Exception:
@@ -493,6 +515,12 @@ class GeneralSession:
                                           trace=visible, cancel=cancel)
                 reply = str(brain(system, user, max_tokens=MAX_REPLY_TOKENS, images=_images(paths)) or '').strip()
             self.cli_sid = getattr(brain, 'session_id', '') or self.cli_sid
+            actual = getattr(brain, 'last_pick', '')
+            if actual and actual != self.pick:
+                choice = next((o for o in provider_options(self.store) if o['pick'] == actual), None)
+                self.pick = actual
+                if choice:
+                    self.provider, self.model = choice['label'], choice.get('model') or ''
             if not reply: raise RuntimeError('the model returned an empty response')
             # the assistant's own "and that's the job done" (selfclose.CHAT_LINE). The marker is a
             # signal to Taskuary, not prose for the owner, so it comes out of what gets filed and

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/taskuary/guard.py

@@ -51,6 +51,7 @@ DENIED = (
     (r'POST', r'^/api/tasks/\d+/handoff$', 'handing work to a person sends them a message'),
     (r'POST', r'^/api/outbox$', 'starting an outbound message is the owner\'s door, not an agent\'s'),
     (r'POST', r'^/api/messages/\d+/reply$', 'opening a reply is the first half of sending one'),
+    (r'POST', r'^/api/tasks/\d+/clarify$', 'opening a clarification is the first half of sending one'),
     (r'POST|PUT|PATCH|DELETE', r'^/api/(connectors|sources)', 'credentials and where mail goes'),
     (r'GET', r'^/api/send-targets$', 'the address book of everywhere this install can send'),
     # ...and anything that would let it widen its own reach

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/taskuary/ingest.py

@@ -289,7 +289,8 @@ def ingest_message(store, msg: dict, actor: str = 'router', llm=None, file_only:
                     # and the only sign was rows that stayed on "triaging…"
                     mid = _land(store, msg, None, 'filed')
                     store.add_route(mid, None, 'file', None,
-                                    f"AI triage failed ({fail['err']}) - filed; fix the AI connector and it will classify new mail", [], 'triage')
+                                    f"AI triage failed ({fail['err']}) - filed; fix the AI connector and it will classify new mail",
+                                    [], 'triage', parse_error=fail['err'])
                     store.set_setting('triage_last_error', fail['err'][:200], 'system')
                     logger.warning(f"ingest: AI triage failed, filed - {fail['err']}")
                     return {'status': 'filed', 'task_id': None, 'message_id': mid}
@@ -301,7 +302,8 @@ def ingest_message(store, msg: dict, actor: str = 'router', llm=None, file_only:
                     mid = _land(store, msg, None, 'filed')
                     store.add_route(mid, None, 'file', None,
                                     'AI triage returned an answer it could not read as a verdict - filed rather than '
-                                    'assumed to be work' + _notes_note(), [], 'triage')
+                                    'assumed to be work' + _notes_note(), [], 'triage',
+                                    raw_output=intent.get('raw_output'), parse_error=intent.get('parse_error'))
                     logger.warning(f"ingest: unusable AI verdict, filed - {msg.get('subject') or ''}")
                     return {'status': 'filed', 'task_id': None, 'message_id': mid}
         else:
@@ -326,8 +328,9 @@ def ingest_message(store, msg: dict, actor: str = 'router', llm=None, file_only:
         # 'escalate' was declared in the policy precedence and then read by nobody. It IS
         # the urgency rule: the owner names the senders whose mail jumps the queue, and that
         # is the only thing that marks a task urgent.
-        # `kind` ROUTES the work: coding = an agent on a checkout, general = the owner's own list,
-        # reply = the responder and Review. It is triage's judgement, made against TRIAGE.md, and
+        # `kind` ROUTES the work: coding = an agent on a checkout, general = a non-coding agent
+        # conversation, task = the owner's own list, reply = the responder and Review. It is
+        # triage's judgement, made against TRIAGE.md, and
         # the keyword scan in draft_task_fields is only the fallback for a brain that did not say
         # (or triage switched off). Nothing downstream second-guesses it - see auto_code_ok.
         judged = cfg.get('intent_classify_enabled', '1') == '1'       # a brain (or a by-construction rule) said 'task'

{taskuary-0.3.2.7 → taskuary-0.3.2.8}/taskuary/llm.py

@@ -104,21 +104,56 @@ def build_llm(store, pick=None, model=None, trace=None, cancel=None, resume=None
 def _build_llm(store, pick=None, model=None, trace=None, cancel=None, resume=None):
     """The brain named by `pick` ('' = first active AI connector, 'connector:<id>',
     'cli:<agent>'), defaulting to the triage_ai setting - callers like reports may name
-    their OWN brain and model per job instead of riding the triage tier."""
-    pick = (pick if pick is not None else store.get_settings().get('triage_ai') or '').strip()
-    if pick.startswith('cli:'): return make_cli_llm(store, pick[4:], model, trace=trace, cancel=cancel, resume=resume)
-    want = pick[10:] if pick.startswith('connector:') else None
-    want_id = int(want) if want and want.isdigit() else None
-    for c in store.list_connectors():
-        # a local model server (ollama) is the one brain that needs no key to be real
-        ready = c['Active'] and (c['HasSecret'] or c['Type'] == 'ollama')
-        selected = not want or (c['ConnectorId'] == want_id if want_id is not None else c['Type'] == want)
-        if c['Type'] in AI_TYPES and ready and selected:
-            full = store.get_connector(c['ConnectorId'], with_secret=True)
-            cfg = json.loads(full.get('ConfigJson') or '{}')
-            if model: cfg = {**cfg, 'model': model}
-            return make_llm(full['Type'], cfg, full.get('Secret'))
-    return None
+    their OWN brain and model per job instead of riding the triage tier. The owner's ordered
+    backup-brain setting applies to both cases, but a fallback uses its own model and starts a
+    fresh conversation - provider-specific model/session identifiers never cross that line."""
+    settings = store.get_settings()
+    primary = str(pick if pick is not None else settings.get('triage_ai') or '').strip()
+    backups = [x.strip() for x in str(settings.get('triage_backup_ai') or '').split(',') if x.strip()]
+    picks = []
+    for candidate in [primary, *backups]:
+        if candidate not in picks: picks.append(candidate)
+
+    def one(candidate, first=False):
+        chosen_model, chosen_resume = (model, resume) if first else (None, None)
+        if candidate.startswith('cli:'):
+            return make_cli_llm(store, candidate[4:], chosen_model, trace=trace, cancel=cancel,
+                                resume=chosen_resume)
+        want = candidate[10:] if candidate.startswith('connector:') else None
+        want_id = int(want) if want and want.isdigit() else None
+        for c in store.list_connectors():
+            # a local model server (ollama) is the one brain that needs no key to be real
+            ready = c['Active'] and (c['HasSecret'] or c['Type'] == 'ollama')
+            selected = not want or (c['ConnectorId'] == want_id if want_id is not None else c['Type'] == want)
+            if c['Type'] in AI_TYPES and ready and selected:
+                full = store.get_connector(c['ConnectorId'], with_secret=True)
+                config = json.loads(full.get('ConfigJson') or '{}')
+                if chosen_model: config = {**config, 'model': chosen_model}
+                return make_llm(full['Type'], config, full.get('Secret'))
+        return None
+
+    brains = [(candidate, one(candidate, i == 0)) for i, candidate in enumerate(picks)]
+    brains = [(candidate, brain) for candidate, brain in brains if brain]
+    if not brains: return None
+    if len(brains) == 1: return brains[0][1]
+
+    def failover(system, user, **kwargs):
+        from .agents import availability_failure
+        last = None
+        for i, (candidate, brain) in enumerate(brains):
+            try:
+                out = brain(system, user, **kwargs)
+                failover.last_pick = candidate
+                failover.session_id = getattr(brain, 'session_id', None)
+                return out
+            except Exception as e:
+                last = e
+                if i == len(brains) - 1 or not availability_failure(e): raise
+                if trace: trace('progress', 'fallback',
+                                f'{candidate or "automatic AI"} is unavailable; trying {brains[i + 1][0]}')
+        raise last
+    failover.last_pick, failover.session_id = primary, resume
+    return failover
 
 
 def make_llm(t, cfg: dict, key: str):