taskuary 0.3.6.2__tar.gz → 0.3.6.3__tar.gz

{taskuary-0.3.6.2/taskuary.egg-info → taskuary-0.3.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskuary
-Version: 0.3.6.2
+Version: 0.3.6.3
 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
@@ -69,7 +69,7 @@ Dynamic: license-file
 
 [![CI](https://github.com/ldbumble/taskuary/actions/workflows/ci.yml/badge.svg)](https://github.com/ldbumble/taskuary/actions/workflows/ci.yml)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/ldbumble/taskuary/badge)](https://scorecard.dev/viewer/?uri=github.com/ldbumble/taskuary)
-[![PyPI](https://img.shields.io/pypi/v/taskuary.svg?cacheSeconds=300&release=0.3.6.2&asof=2026-09-22g)](https://pypi.org/project/taskuary/)
+[![PyPI](https://img.shields.io/pypi/v/taskuary.svg?cacheSeconds=300&release=0.3.6.3&asof=2026-09-22h)](https://pypi.org/project/taskuary/)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10%2B-3776ab.svg)](https://github.com/ldbumble/taskuary)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Stars](https://img.shields.io/github/stars/ldbumble/taskuary?style=flat&color=d4a72c&label=%E2%98%85%20stars)](https://github.com/ldbumble/taskuary/stargazers)
@@ -83,7 +83,7 @@ your agents, and brings decisions back to you. Nothing sends or ships without yo
 
 ![The Taskuary Studio assembling as work arrives and AI agents take their seats.](https://raw.githubusercontent.com/ldbumble/taskuary/master/docs/hero.gif?v=workspace)
 
-Taskuary is early—currently **v0.3.6.2**—so breaking changes are still possible before 1.0.
+Taskuary is early—currently **v0.3.6.3**—so breaking changes are still possible before 1.0.
 
 <p align="center">
   <a href="https://taskuary.com/demo/"><img
@@ -270,10 +270,10 @@ outside systems, send messages, run tools, or start agents. Its changes reset wh
 
 ## Installs
 
-![Daily installs of taskuary from PyPI, mirror traffic excluded](https://raw.githubusercontent.com/ldbumble/taskuary/master/docs/downloads.svg)
+![Daily installs of taskuary from PyPI, mirror traffic excluded](https://raw.githubusercontent.com/ldbumble/taskuary/stats/downloads.svg)
 
 Updated daily from PyPI with mirror traffic excluded. The raw series is
-[docs/downloads.csv](docs/downloads.csv).
+[downloads.csv on the `stats` branch](https://github.com/ldbumble/taskuary/blob/stats/downloads.csv).
 
 ## Documentation
 

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/README.md

@@ -4,7 +4,7 @@
 
 [![CI](https://github.com/ldbumble/taskuary/actions/workflows/ci.yml/badge.svg)](https://github.com/ldbumble/taskuary/actions/workflows/ci.yml)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/ldbumble/taskuary/badge)](https://scorecard.dev/viewer/?uri=github.com/ldbumble/taskuary)
-[![PyPI](https://img.shields.io/pypi/v/taskuary.svg?cacheSeconds=300&release=0.3.6.2&asof=2026-09-22g)](https://pypi.org/project/taskuary/)
+[![PyPI](https://img.shields.io/pypi/v/taskuary.svg?cacheSeconds=300&release=0.3.6.3&asof=2026-09-22h)](https://pypi.org/project/taskuary/)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10%2B-3776ab.svg)](https://github.com/ldbumble/taskuary)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Stars](https://img.shields.io/github/stars/ldbumble/taskuary?style=flat&color=d4a72c&label=%E2%98%85%20stars)](https://github.com/ldbumble/taskuary/stargazers)
@@ -18,7 +18,7 @@ your agents, and brings decisions back to you. Nothing sends or ships without yo
 
 ![The Taskuary Studio assembling as work arrives and AI agents take their seats.](https://raw.githubusercontent.com/ldbumble/taskuary/master/docs/hero.gif?v=workspace)
 
-Taskuary is early—currently **v0.3.6.2**—so breaking changes are still possible before 1.0.
+Taskuary is early—currently **v0.3.6.3**—so breaking changes are still possible before 1.0.
 
 <p align="center">
   <a href="https://taskuary.com/demo/"><img
@@ -205,10 +205,10 @@ outside systems, send messages, run tools, or start agents. Its changes reset wh
 
 ## Installs
 
-![Daily installs of taskuary from PyPI, mirror traffic excluded](https://raw.githubusercontent.com/ldbumble/taskuary/master/docs/downloads.svg)
+![Daily installs of taskuary from PyPI, mirror traffic excluded](https://raw.githubusercontent.com/ldbumble/taskuary/stats/downloads.svg)
 
 Updated daily from PyPI with mirror traffic excluded. The raw series is
-[docs/downloads.csv](docs/downloads.csv).
+[downloads.csv on the `stats` branch](https://github.com/ldbumble/taskuary/blob/stats/downloads.csv).
 
 ## Documentation
 

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taskuary"
-version = "0.3.6.2"
+version = "0.3.6.3"
 description = "Automate your job - the local-first operating system for your work: AI triage in, coding agents out."
 readme = "README.md"
 license = { text = "MIT" }
@@ -71,10 +71,11 @@ include = ["taskuary*"]
 [tool.setuptools.package-data]
 # whatsapp/ too: the bridge error tells you to run `node bridge.mjs` out of the package, and
 # a pip install without it is an instruction pointing at a directory that does not exist.
-# lanes.json is the ONE lane vocabulary the desktop imports at build time and funnel.py reads at
-# runtime - a wheel without it cannot name a lane at all.
+# *.json: every data file at the package root is read at runtime - lanes.json is the ONE lane
+# vocabulary, and triage_kind_rules.json, settings_schema.json and connectorcatalog.json were all
+# missing from the wheel once (the container died on the first; 2026-09-23). Name them by glob.
 # A GLOB HERE DOES NOT CROSS A DIRECTORY SEPARATOR: `web/*` matches nothing inside `web/assets/`,
 # which is why that line exists - and `web/walk/*` had to be added after the setup walk's nine
 # screenshots shipped broken. Every new subdirectory under web/ needs its own line, or its files
 # are simply absent from the wheel while the repo tree looks right.
-taskuary = ["lanes.json", "web/*", "web/assets/*", "web/walk/*", "templates/*.md", "templates/history/*.md", "skills/*/*.md", "whatsapp/*"]
+taskuary = ["*.json", "web/*", "web/assets/*", "web/walk/*", "templates/*.md", "templates/history/*.md", "skills/*/*.md", "whatsapp/*"]

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/taskuary/assistant.py

@@ -25,7 +25,7 @@ it brings in until it says something useful and surprising"). Handed only subjec
 wrote 'no content given' in its own notes; so the check now reads WHAT PEOPLE SAID (the words of every
 human thread of the last two days, the owner's lines marked), who is OUT OF OFFICE (from auto-replies -
 a chase to someone away is worse than silence), the CALENDAR, and the actual words in every rolled-up
-arrival (including machine mail), with each report's schedule and each failure's cause beside the count. That is where "Yittie said exporting freezes the
+arrival (including machine mail), with each report's schedule, when it last ran and what that run did, and each failure's cause beside the count. That is where "Yittie said exporting freezes the
 app - and she is in Monday's meeting" comes from.
 
 It also leaves itself a NOTE: each check ends with what it looked at and found nothing in, when
@@ -503,7 +503,7 @@ def blk_label(bid: str) -> str:
 # ── the model's pass: its own read, given what it already said ───────────────────────────────
 CONTRACT = ('\n\nYou are writing your POST on the owner\'s Timeline - the short list of things worth saying right now. You get '
             'CANDIDATES the hub found itself (each with a key), WHAT PEOPLE SAID (the words, by thread), who is OUT OF OFFICE, the '
-            'CALENDAR, what arrived (with each report\'s schedule and each failure\'s cause), what got done, what is open, and WHAT '
+            'CALENDAR, what arrived (with each report\'s schedule, when it last ran and what that run did, and each failure\'s cause), what got done, what is open, and WHAT '
             'YOU ALREADY SAID. Answer JSON only: {"say": [{"key": "<a candidate key, or idea:<short-slug> for a thought of your own>", '
             '"text": "<one line, under 30 words, first person: the fact and what I would do - quote the phrase or name the cause when there is one>", '
             '"section": "<people|loose|ideas|systems - which part of the post this belongs under: people = what somebody said '
@@ -536,14 +536,26 @@ def _schedules(store) -> dict:
     nothing without its clock: 25 digests in two days on an on_startup report is 25 launches, not a
     scheduler bug, and two seeded reports at one timestamp is one launch, not a restart to explain."""
     from . import reports
-    out = {}
+    out, st = {}, store.get_settings()
     for src in store.list_sources(active_only=False):
         if src.get('Channel') != 'report': continue
         try: c = json.loads(src.get('ConfigJson') or '{}')
         except ValueError: continue
-        out[c.get('title') or src.get('Address')] = reports.schedule_words(c)
+        out[c.get('title') or src.get('Address')] = reports.schedule_words(c) + _last_run(st, src)
     return out
 
+def _last_run(settings: dict, src: dict) -> str:
+    """'; last ran Tue 22 Sep 20:37, nothing to report so nothing was filed' - or ''. The clock alone
+    misled: a routed report whose judge holds a run back files NO message, so the newest mid read as
+    the last firing and a 140-minute timer looked stalled two runs after it fired on time (TQ-0685).
+    The run record on the source (reports.LAST_RUN) is the receipt the arrivals cannot carry."""
+    from .reports import LAST_RUN
+    try: rec = json.loads(settings.get(f"{LAST_RUN}{src['SourceId']}") or '{}')
+    except (ValueError, TypeError): rec = {}
+    if not rec.get('at'): return ''
+    what = 'failed' if rec.get('failed') else f"posted mid {rec['message_id']}" if rec.get('message_id') else 'nothing to report so nothing was filed'
+    return f"; last ran {_when(rec['at'])}, {what}"
+
 _FAILS = re.compile(r'fail|error|denied|timeout|could not|unable', re.I)
 _GH_FAILED = re.compile(r'^(.+?) Failed in ', re.M)          # the job lines of GitHub's "Run failed" mail
 def _cause(r: dict) -> str:
@@ -852,7 +864,7 @@ def system_checks(store, source_ids=None, inline=None) -> str:
     ids = saved if source_ids is None else _ids(source_ids)
     subs = own if inline is None else _inline(inline)
     if not ids and not subs:
-        return '(none selected - add a data source, or choose saved data views, on Reports -> Assistant)'
+        return '(none selected - add a data source, or choose saved data views, on Reports -> Advisor)'
     from . import reports
     found = {s['SourceId']: s for s in store.list_sources(active_only=False) if s.get('Channel') == 'report'}
     jobs = []                                     # (title, cfg to render, or a note to print instead)
@@ -862,7 +874,7 @@ def system_checks(store, source_ids=None, inline=None) -> str:
         try: cfg_ = json.loads(src.get('ConfigJson') or '{}')
         except ValueError: cfg_ = {}
         title = str(cfg_.get('title') or src.get('Address') or f'report {sid}')
-        if cfg_.get('type') == 'assistant': jobs.append((title, None, 'Skipped: an Assistant cannot watch itself.'))
+        if cfg_.get('type') == 'assistant': jobs.append((title, None, 'Skipped: an Advisor cannot watch itself.'))
         else: jobs.append((title, cfg_, None))
     for i, sub in enumerate(subs, 1):
         jobs.append((str(sub.get('label') or sub.get('title') or '').strip() or f"{sub.get('type')} #{i}", sub, None))
@@ -1166,10 +1178,10 @@ def _idea_message(store, i: dict, a: dict, report_title=None) -> tuple:
     active = bool(task and task.get('Status') in ('open', 'in_progress', 'waiting'))
     working = bool(active and any(r.get('Status') == 'running' for r in store.list_runs(tid)))
     stamp = i.get('LastSaid') or i.get('FirstSeen') or datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-    who = report_title or 'Assistant'
+    who = report_title or 'Advisor'
     # one arrival per idea: the stamp in the id made every re-say a fresh message, and a fresh task once the first closed
     msg = {'external_id': f"idea:{i['IdeaId']}", 'channel': CHANNEL, 'from_name': who, 'source_name': who,
-           'conversation_id': str(i.get('Key') or f"idea:{i['IdeaId']}"), 'subject': f"Assistant idea: {_cut(i.get('Text'), 100)}",
+           'conversation_id': str(i.get('Key') or f"idea:{i['IdeaId']}"), 'subject': f"Advisor idea: {_cut(i.get('Text'), 100)}",
            'sent_at': stamp, 'body': str(i.get('Text') or '') + (f"\n\nwhy: {a.get('why')}" if a.get('why') else ''),
            'idea_context': {'report': report_title, 'kind': i.get('Kind'),
                             'linked_task': f"{task_ref(tid)} [{task.get('Status')}] {_short(task.get('Title'), 80)}" if task else None,
@@ -1448,7 +1460,7 @@ def _run(store, llm, instruction, watch_source_ids, watch_sources, systems_only=
     if systems_only and not (_ids(watch_source_ids) or _inline(watch_sources)):
         why = ('this report reads nothing: no Taskuary block is ticked and no data source is chosen '
                '- tick a block, or choose a source, on the report')
-        logger.warning(f"assistant: {report_title or 'Assistant'} ran and read nothing - {why}")
+        logger.warning(f"assistant: {report_title or 'Advisor'} ran and read nothing - {why}")
         return {'ran': True, 'said': 0, 'reads_nothing': True, 'summary': why, 'inputs': '',
                 'reviewed': {'notes': '', 'scope': 'nothing', 'systems': 0, 'why': why}}
     state = {i['Key']: i for i in store.list_ideas()}
@@ -1522,7 +1534,7 @@ def _run(store, llm, instruction, watch_source_ids, watch_sources, systems_only=
         # chose "every run", in which case the check still says it ran, in one line, with what it
         # read behind it. A setting that promises every run and then shows nothing is a lie.
         if not always_post: return {'ran': True, 'said': 0, 'reviewed': rv, 'inputs': read}
-        who = (report_title or 'Assistant') if own_post else 'Assistant'
+        who = (report_title or 'Advisor') if own_post else 'Advisor'
         me = f'assistant:{report_id}' if own_post else 'assistant'
         mid = store.add_message({'TaskId': None, 'ExternalId': f'{me}:{stamp}', 'ConversationId': me, 'Channel': CHANNEL,
                                  'SourceName': who, 'Subject': f'{who} - nothing to report', 'FromName': who,
@@ -1551,7 +1563,7 @@ def _run(store, llm, instruction, watch_source_ids, watch_sources, systems_only=
     head = rows[0]['Text'] if len(rows[0]['Text']) <= 90 else rows[0]['Text'][:90].rsplit(' ', 1)[0] + '…'
     subj = head + (f' (+{len(rows) - 1} more)' if len(rows) > 1 else '')
     identity = f'assistant:{report_id}' if own_post else 'assistant'
-    name = (report_title or 'Assistant') if own_post else 'Assistant'
+    name = (report_title or 'Advisor') if own_post else 'Advisor'
     mid = store.add_message({'TaskId': None, 'ExternalId': f'{identity}:{stamp}', 'ConversationId': identity, 'Channel': CHANNEL,
                              'SourceName': name, 'Subject': subj, 'FromName': name, 'SentAt': stamp,
                              'BodyText': body, 'Status': 'feed'})
@@ -1623,7 +1635,7 @@ def act(store, idea_id: int, verb: str, actor: str = 'owner', llm=None, days: in
             # This is NEW work noticed after an earlier task was completed. A message can point
             # at only one task, so do not steal it from history or rename/reopen the completed
             # task. Carry the evidence into a fresh assistant-owned task instead.
-            title = str(a.get('title') or i.get('Text') or 'Assistant follow-up').strip()[:200]
+            title = str(a.get('title') or i.get('Text') or 'Advisor follow-up').strip()[:200]
             source_text = str(message.get('BodyText') or '').strip()
             summary = str(i.get('Text') or '').strip()
             if source_text and source_text not in summary: summary += f'\n\nSource message: {source_text}'

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/taskuary/channels.py

@@ -336,6 +336,15 @@ def test_connector(store, cid: int) -> dict:
         elif c['Type'] == 'robinhood':
             from . import robinhood
             detail = robinhood.test(store, c)
+        elif c['Type'] in ('bluesky', 'mastodon'):
+            # whoami, like LinkedIn: the one call that proves the credential AND comes back
+            # with something the owner recognises. Posting would be a strange thing for Test.
+            from .reports import REGISTRY, resolve_cfg
+            rtype = f"{c['Type']}_me"
+            out = REGISTRY[rtype](resolve_cfg(store, {'type': rtype}))
+            row = (out.get('rows') or [{}])[0]
+            detail = (f"signed in as {row.get('handle') or '?'}"
+                      f" - {row.get('followers')} followers, {row.get('posts')} posts")
         elif c['Type'] == 'linkedin':
             # whoami, which is the one call that proves the token AND returns something the
             # owner recognises - a post would be a strange thing for a Test button to do

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/taskuary/cli.py

@@ -122,6 +122,11 @@ def main():
                          'this transcript, and draft the reply the sender gets (you are not '
                          'sending it - the owner approves it). Give one sentence on what you did '
                          'or found. Do not run this while waiting on the owner.')
+    ap.add_argument('--reply', metavar='TEXT',
+                    help="write the reply the person who asked will get, in your own words - it becomes this "
+                         "task's pending reply for the owner to approve (you are not sending it), and "
+                         "finishing keeps it instead of redrafting. Use - to read it from stdin.")
+    ap.add_argument('--reply-file', metavar='PATH', help='--reply, read from a file (for a long or multi-line reply)')
     args = ap.parse_args()
     if args.demo:
         import os, tempfile
@@ -133,6 +138,29 @@ def main():
     # --done goes over HTTP, unlike --note. A note is a database row and any process can write
     # one; ENDING a task needs the live session's scrollback, which exists only inside the
     # running server - this process would find no transcript and wrap an empty one.
+    if args.reply is not None or args.reply_file:
+        import os, sys, requests
+        try: sys.stdout.reconfigure(encoding='utf-8', errors='replace')
+        except (AttributeError, OSError): pass
+        tid = os.environ.get('TASKUARY_TASK')
+        if not str(tid).isdigit():
+            print('not in a Taskuary session - TASKUARY_TASK is not set, so there is no task to reply on')
+            return
+        if args.reply_file: text = open(args.reply_file, encoding='utf-8').read()
+        else: text = sys.stdin.read() if args.reply == '-' else args.reply
+        srv = config.load()['server']
+        host = '127.0.0.1' if srv.get('host') in ('0.0.0.0', '::', '', None) else srv['host']
+        base = f"http://{host}:{srv.get('port') or 7787}"
+        hdr = {'X-Taskuary-Token': srv['token']} if srv.get('token') else {}
+        try:
+            r = requests.post(f'{base}/api/agent/reply', timeout=60, headers=hdr,
+                              json={'task_id': int(tid), 'text': text, 'agent': os.environ.get('TASKUARY_AGENT') or 'agent'})
+            out = r.json() if r.headers.get('content-type', '').startswith('application/json') else {}
+        except Exception as e:
+            print(f'could not reach Taskuary at {base}: {e}'); return
+        print('reply saved on the task, waiting on the owner to approve and send it.' if out.get('ok')
+              else f"not saved: {out.get('why') or out.get('detail') or r.text[:200]}")
+        return
     if args.done is not None:
         import os, sys, requests
         try: sys.stdout.reconfigure(encoding='utf-8', errors='replace')

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/taskuary/coder.py

@@ -105,6 +105,50 @@ def reply_target(store, task_id: int):
     return next((m['MessageId'] for m in reversed(store.list_messages(task_id)) if m.get('Status') != 'context'), None)
 
 
+# ── the agent's own words ───────────────────────────────────────────────────────────────
+# The agent that did the work often writes the better answer: it knows what it found, and a second
+# model redrafting from its transcript loses the nuance (the owner, 2026-09-23: "sometimes the agent
+# that did the work is better for response than another ai generating it based off of transcript").
+# It used to have no way to hand that answer over - it asked "should I draft the reply?", wrote it
+# on its own screen, and the task's reply stayed empty until the responder wrote a different one.
+# Now it says so: `taskuary --reply` (a shell) or a [[TASKUARY-REPLY]] block (the general chat), the
+# text becomes the task's pending reply as written, and the end of the run keeps it.
+AGENT_DRAFT = 'agent:'
+
+def agent_drafted(rv) -> bool:
+    return bool(rv) and str(rv.get('DraftBy') or '').startswith(AGENT_DRAFT) and bool(str(rv.get('DraftText') or '').strip())
+
+
+def own_draft(store, task_id: int):
+    """The pending reply the agent wrote itself, if there is one."""
+    return next((r for r in (store.pending_review(task_id, 'draft_reply', live_only=False),
+                             store.pending_review(task_id, 'draft', live_only=False)) if agent_drafted(r)), None)
+
+
+def agent_reply(store, task_id: int, text: str, agent: str = 'agent', run_id: int = None) -> dict:
+    """Put the agent's reply on the task as the pending draft - the same review the responder would
+    write into (held, live or new; one per answer, PW-236), marked as the agent's. Nothing is sent:
+    the owner approves it like every other reply."""
+    text = str(text or '').strip()
+    if not text: return {'ok': False, 'why': 'no reply text'}
+    held = store.held_review(task_id) or {}
+    mid = reply_target(store, task_id) or held.get('MessageId')
+    if not mid: return {'ok': False, 'why': 'nobody is waiting on a reply on this task - there is no one to draft it to'}
+    live = None if held else (store.pending_review(task_id, 'draft_reply', live_only=False) or store.pending_review(task_id, 'draft', live_only=False))
+    why = f'{agent} wrote this reply in its session - approve to send'
+    if held:
+        rid = held['ReviewId']; store.unhold_review(rid, why)
+    elif live:
+        rid = live['ReviewId']; store.update_review_reason(rid, why, run_id)
+    else:
+        rid = store.add_review({'TaskId': task_id, 'MessageId': mid, 'RunId': run_id, 'Kind': 'draft_reply', 'Status': 'pending', 'Reason': why})
+    rv = store.get_review(rid) or {}
+    if rv.get('MessageId') != mid: store.update_review_message(rid, mid)
+    store.update_review_draft(rid, text, run_id or rv.get('RunId'), by=AGENT_DRAFT + agent)
+    store.add_comment(task_id, agent, 'agent', f'{agent} drafted the reply itself - it is on the task, waiting on your approval.')
+    return {'ok': True, 'review_id': rid, 'message_id': mid}
+
+
 # ── the cheap ending ────────────────────────────────────────────────────────────────────
 # Almost everything a keyboard can do goes to the coding agent (the owner's rule), and the
 # whole bargain is that an agent with nothing to do says "nothing to do here" and stops CHEAPLY.
@@ -213,7 +257,7 @@ def finish(store, task_id: int, rep: dict, run_id: int = None, actor: str = 'cod
     # nobody can send does not hold a task the owner just closed
     if owner_done and mid and not can_send: mid = None
     # a held draft is proof somebody IS waiting on an answer, so it is never quietly dropped here
-    if mid and not held and nobody_waiting(store, mid, rep):
+    if mid and not held and not own_draft(store, task_id) and nobody_waiting(store, mid, rep):
         store.add_comment(task_id, actor, 'agent', 'Nothing needed doing here and the sender is not waiting on an '
                                                    'answer - filed with the report, no reply drafted.')
         mid = None
@@ -432,6 +476,16 @@ def raise_reply(store, task_id: int, mid: int, run_id: int, rep: dict,
         rid = store.add_review({'TaskId': task_id, 'MessageId': mid, 'RunId': run_id, 'Kind': 'draft_reply', 'Status': 'pending',
                                 'Reason': why if fresh.get('state') in ('changed', 'unresolved') else 'coder finished the work - reply awaiting approval'})
     if (held or live) and (held or live).get('MessageId') != mid: store.update_review_message(rid, mid)
+    rv = store.get_review(rid) or {}
+    if agent_drafted(rv):
+        # the agent that did the work wrote this reply itself (agent_reply): its words stand and no second
+        # model rewrites them - only a thread that moved on (or could not be checked) is flagged for a reread
+        who = str(rv.get('DraftBy'))[len(AGENT_DRAFT):] or 'the agent'
+        store.update_review_reason(rid, f"{who}'s own reply from the session - approve to send"
+                                   + (' (the thread moved on after it was written - reread it)' if fresh.get('state') == 'changed' else ''), run_id)
+        if fresh.get('state') in ('changed', 'unresolved'): store.mark_review_stale(rid)
+        _notify_done(store, task_id, rid)
+        return
     src = complete_result or resolution_text(rep)
     if fresh.get('state') == 'changed' and fresh.get('latest'):
         l = fresh['latest']
@@ -450,6 +504,10 @@ def raise_reply(store, task_id: int, mid: int, run_id: int, rep: dict,
     except Exception as e: logger.warning(f'reply draft failed for task {task_id}: {e}')
     # a refresh that failed is an unresolved freshness state the owner sees: the draft waits, stale, for one that succeeds
     if fresh.get('state') == 'unresolved': store.mark_review_stale(rid)
+    _notify_done(store, task_id, rid)
+
+
+def _notify_done(store, task_id: int, rid: int) -> None:
     # the ping that matters most: work FINISHED and its reply is sitting on the task on you
     if (store.get_settings().get('notify_level') or 'needs_me') != 'off':
         from .outbound import notify
@@ -463,3 +521,5 @@ def raise_reply(store, task_id: int, mid: int, run_id: int, rep: dict,
         try: notify(store, f'{task_ref(task_id)} is done - the reply is drafted and waiting on '
                            f'your approval on the task.\n{head}{tail}')
         except Exception as e: logger.warning(f'notify failed for task {task_id}: {e}')
+
+

{taskuary-0.3.6.2 → taskuary-0.3.6.3}/taskuary/concierge.py

@@ -67,7 +67,7 @@ CHIP_WORDS = {'approve': 'Send the reply', 'redraft': 'Redraft it', 'reply': 'Re
               'not_ours_sender': 'Ignore this sender', 'block_sender': 'Block them in Settings',
               'archive': 'Archive it', 'close': 'Close the task',
               'done': 'Handled', 'later': 'Later', 'skip': 'Tomorrow', 'next': 'Next', 'answer_agent': 'Answer it',
-              'stop_agent': 'Stop the agent', 'rerun': 'Run it again', 'split': 'Split it in two',
+              'stop_agent': 'Save and end session', 'rerun': 'Run it again', 'split': 'Split it in two',
               'prep': 'Prep me', 'followup': 'Draft a follow-up'}
 # What the word will actually DO, on hover - written where the difference matters. "Ignore this
 # sender" and "Block them in Settings" are one line apart and not remotely the same act.
@@ -78,10 +78,12 @@ CHIP_HINTS = {'not_ours_sender': 'Their mail keeps arriving and stays readable -
               'mine': "Your own list - no agent starts", 'next': 'Read it and move on'}
 # per kind, in the order they are offered. `next` is last on every one of them: moving on is always available,
 # and it is the one word that is never a decision about the thing itself.
-CHIPS = {'review': ('approve', 'close', 'redraft', 'not_ours', 'next'), 'action': ('approve', 'not_ours', 'next'),
-         'agent': ('answer_agent', 'stop_agent', 'next'), 'meeting': ('prep', 'regular_agent', 'next'),
+# `skip` (Tomorrow) on the kinds that come back after the hour: passing one with Next returns it in an
+# hour, and Tomorrow is how to silence it until the morning instead (2026-09-23)
+CHIPS = {'review': ('approve', 'close', 'redraft', 'not_ours', 'skip', 'next'), 'action': ('approve', 'not_ours', 'skip', 'next'),
+         'agent': ('answer_agent', 'stop_agent', 'skip', 'next'), 'meeting': ('prep', 'regular_agent', 'next'),
          'report': ('rerun', 'regular_agent', 'next'), 'agentdone': ('close', 'reply', 'next'),
-         'wrapup': ('close', 'next'), 'idea': ('followup', 'mine', 'done', 'next'), 'task': ('close', 'next'),
+         'wrapup': ('close', 'next'), 'idea': ('followup', 'mine', 'done', 'next'), 'task': ('close', 'skip', 'next'),
          'asked': ('reply', 'regular_agent', 'coder', 'mine', 'not_ours', 'not_ours_sender', 'next'),
          'todo': ('reply', 'regular_agent', 'coder', 'mine', 'not_ours', 'not_ours_sender', 'next'),
          'fyi': ('not_ours', 'not_ours_sender', 'block_sender', 'mine', 'next'),
@@ -1894,11 +1896,14 @@ PROPOSALS = {
     'close': ('task.complete', 'Close the task', True), 'done': ('item.settle', 'Mark it handled', True),
     'later': ('item.settle', 'Push it back', True), 'skip': ('item.settle', 'Skip until tomorrow', True),
     'approve': ('review.approve', 'Send the reply', True), 'answer_agent': ('agent.answer', 'Send the answer to the agent', True),
-    'stop_agent': ('agent.stop', 'Stop the agent', False), 'rerun': ('report.rerun', 'Run the report again', True),
+    'stop_agent': ('agent.stop', 'Save and end session', False), 'rerun': ('report.rerun', 'Run the report again', True),
     'remember': ('memory.remember', 'Remember it', False), 'split': ('task.split', 'Split it in two', False),
     'clear': ('pipe.clear', 'Clear them from the pipe', False), 'setup': ('task.setup', 'Open the walk-through', False),
 }
-AUTO = ('done', 'skip', 'later', 'close')     # settles what is on the table; nothing leaves, nothing is handed off
+# ...and ending the agent's session, which the task page's own button does on the click: it writes the
+# session up and drafts the reply for your yes - nothing leaves (the owner, 2026-09-23: "it should be save
+# end session as well same as in task", having been asked to confirm a card that read "wrap: false")
+AUTO = ('done', 'skip', 'later', 'close', 'stop_agent')     # settles what is on the table; nothing leaves, nothing is handed off
 # the operations that take the item off the table, so the walk moves on after them (the page reads
 # `settles` off the proposal it is holding; a chat comes back a turn later and has only the kind)
 SETTLING_KINDS = frozenset(kind for kind, _label, settles in PROPOSALS.values() if settles)
@@ -2031,12 +2036,15 @@ def propose_for(store, dock_tid: int, decision: dict, item: dict | None, text: s
     elif verb == 'stop_agent':
         end = _agent_task(store, item, text)
         if not end: raise ValueError('no agent is running right now - nothing to stop')
-        asked_wrap = wrap = bool(re.search(r"\b(wrap|finished|it'?s done)\b", text, re.I))
-        if wrap:                                     # a wrap writes the report FROM the transcript: without one there is nothing to wrap
-            from . import terminal as term
-            try: wrap = bool((term.transcript_for(store, end) or ('',))[0].strip())
-            except Exception: wrap = False
-        target, params, label = end, {'wrap': wrap}, ('Wrap it up' if wrap else label)
+        # THE TASK PAGE'S "Save and end session", whatever the words: the session is written up whenever
+        # there is a transcript to write it from (a wrap writes the report FROM it), and simply ended when
+        # there is none. It used to write up only on the word "wrap" - so the button stopped an agent and
+        # threw its work away, where the page's button of the same meaning kept it.
+        asked_wrap = bool(re.search(r"\b(wrap|finished|it'?s done)\b", text, re.I))
+        from . import terminal as term
+        try: wrap = bool((term.transcript_for(store, end) or ('',))[0].strip())
+        except Exception: wrap = False
+        target, params = end, {'wrap': wrap}
         if asked_wrap and not wrap: note = ' There is no transcript to write a report from yet, so there is nothing to wrap - this stops the agent and the task stays open.'
     elif verb == 'rerun': target = it.get('source_id')
     elif verb == 'remember':
@@ -2063,7 +2071,7 @@ def propose_for(store, dock_tid: int, decision: dict, item: dict | None, text: s
     head = f"Changed to: {label} - {summary}" if op['version'] > 1 else f"{label}: {summary}"
     say_ = lead + f"{head}.{note} Nothing has been started - confirm below, or tell me what to change."
     return {**op, 'verb': verb, 'label': label, 'summary': summary, 'settles': bool(settles and not elsewhere),
-            'key': it.get('key'), 'ref': it.get('ref'), 'tid': it.get('tid'), 'say': say_}
+            'key': it.get('key'), 'ref': it.get('ref'), 'tid': it.get('tid'), 'say': say_, 'note': note.strip()}
 
 
 def propose_direct(store, verb: str, key: str, text: str = '', actor: str = 'owner', table: bool = False) -> dict:
@@ -2082,7 +2090,7 @@ def propose_direct(store, verb: str, key: str, text: str = '', actor: str = 'own
     record_related(store, tid, item, 'user', f"{PROPOSALS[verb][1]}: {item.get('title') or item.get('ref') or key}")
     prop = propose_for(store, tid, {'verb': verb, 'text': text or ''}, item, text or '', actor, table=item if table else None)
     prop['settles'] = bool(table and PROPOSALS[verb][2])
-    if table and verb in AUTO: prop.update(auto=True, say=f"{prop['label']} - {_where(item)}.")
+    if table and verb in AUTO: prop.update(auto=True, say=f"{prop['label']} - {_where(item)}." + (f" {prop['note']}" if prop.get('note') else ''))
     record_related(store, tid, item, 'assistant', prop['say'], {'kind': 'proposal', 'key': prop.get('key'), 'title': prop['label'], 'op': prop['id'],
                                                                'tid': prop.get('tid'), 'ref': prop.get('ref'), 'lane': item.get('lane')})
     return prop
@@ -2264,7 +2272,6 @@ def describe_op(store, op: dict) -> tuple:
     if kind == 'preference.exclude_sender': label = 'Silence this sender' if p.get('scope') == 'sender' else 'File it and remember this kind'
     if kind == 'item.settle': label = {'later': 'Push it back', 'skip': 'Skip until tomorrow'}.get(str(p.get('verb')), 'Mark it handled')
     if kind == 'task.complete' and p.get('agent'): label = 'Close the task and stop its agent'
-    if kind == 'agent.stop' and p.get('wrap'): label = 'Wrap it up'
     if kind == 'report.create': label = 'Create the report'
     if kind == 'connection.create': label = 'Create the connection'
     if kind in toolcatalog.INSTANT or kind == 'report.delete':
@@ -2324,7 +2331,7 @@ def _outcome_line(kind: str, p: dict, o: dict | None) -> str:
         if o.get('existing'): return f" {o.get('agent') or 'An agent'} was already on it."
         if o.get('started') or o.get('chat'): return f" {o.get('agent') or 'The agent'} is on it - moving on."
     if kind == 'item.settle' and o.get('closed'): return f" {task_ref(int(o['closed']))} closed."
-    if kind == 'agent.stop' and not p.get('wrap'): return ' The task stays open - say close it when you want it closed.'
+    if kind == 'agent.stop': return ' The task stays open - say close it when you want it closed.'
     if kind == 'memory.remember': return ' A memory settles nothing: the walk is where it was.'
     if kind == 'report.create' and o.get('sourceId'):
         return f" \"{o.get('title')}\" is on the Reports tab{' and runs on its schedule' if o.get('enabled') else ', switched off'}."
@@ -2536,7 +2543,8 @@ def say(store, text: str, key: str = None, llm=None, actor: str = 'owner', trace
         # 2026-09-07: "I did already - it should close it; only confirm when you are not sure"). A hand-off, a
         # send, a rule or a verb aimed elsewhere still waits for the button.
         if verb in AUTO and not elsewhere:
-            prop.update(auto=True, say=f"{prop['label']} - {_where(target_item or {})}.")
+            # ...and a run at once still says what it could not do ("nothing to wrap")
+            prop.update(auto=True, say=f"{prop['label']} - {_where(target_item or {})}." + (f" {prop['note']}" if prop.get('note') else ''))
         rec('assistant', prop['say'], {'kind': 'proposal', 'key': prop.get('key'), 'title': prop['label'], 'op': prop['id'],
                                         'tid': prop.get('tid'), 'ref': prop.get('ref'), 'lane': (target_item or {}).get('lane')})
         return {'say': prop['say'], 'options': [], 'decision': None, 'proposal': prop}